tree 26c61eb7745da0c0d9135e9d12088f570cb8530d
parent da7878d75b8520c9ae00d27dfbbce546a7bfdfbb
parent fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43
author Ingo Molnar <mingo@elte.hu> 1216978627 +0200
committer Ingo Molnar <mingo@elte.hu> 1216978627 +0200

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>