Conflicts:
	scripts/recordmcount.pl

Merge reason: Merge up to v2.6.33.
Signed-off-by: NIngo Molnar <mingo@elte.hu>