1
linux/arch/x86/include
Ingo Molnar 7cd2541cf2 Merge commit 'v2.6.36-rc7' into perf/core
Conflicts:
	arch/x86/kernel/module.c

Merge reason: Resolve the conflict, pick up fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2010-10-08 10:46:27 +02:00
..
asm Merge commit 'v2.6.36-rc7' into perf/core 2010-10-08 10:46:27 +02:00