Ingo Molnar 0e2f65ee30 Merge branch 'linus' into x86/pebs ...

Conflicts:

	arch/x86/Kconfig.cpu
	arch/x86/kernel/cpu/intel.c
	arch/x86/kernel/setup_64.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2008-07-25 11:37:07 +02:00

9.0 KiB

Raw Blame History

View Raw