Merge branch 'linus' into x86/paravirt-spinlocks

Conflicts:

	arch/x86/kernel/Makefile

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

diff --cc arch/x86/kernel/Makefile
index 78d52171400be899a886759acb1c800b5acc90dc,da140611bb57593ed401a5de6ee63a84cc408349..058c5594f4934895387f414c7dea415a5c5a7dca
--- 1/arch/x86/kernel/Makefile
--- 2/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@@ -7,11 -7,9 +7,10 @@@ extra-y                := head_$(BITS).
  CPPFLAGS_vmlinux.lds += -U$(UTS_MACHINE)
  
  ifdef CONFIG_FTRACE
 -# Do not profile debug utilities
 +# Do not profile debug and lowlevel utilities
- CFLAGS_REMOVE_tsc_64.o = -pg
- CFLAGS_REMOVE_tsc_32.o = -pg
+ CFLAGS_REMOVE_tsc.o = -pg
  CFLAGS_REMOVE_rtc.o = -pg
 +CFLAGS_REMOVE_paravirt.o = -pg
  endif
  
  #

diff --cc arch/x86/kernel/setup.c
Simple merge