]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
Merge branches 'x86/signal' and 'x86/irq' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Mon, 8 Dec 2008 14:46:30 +0000 (15:46 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 8 Dec 2008 14:46:36 +0000 (15:46 +0100)
Merge these pending x86 tree changes into the perfcounters tree
to avoid conflicts.

1  2  3 
arch/x86/ia32/ia32_signal.c
arch/x86/kernel/Makefile

Simple merge
index b62a7667828eb77574128a8ca82b1f54cee28238,ef28c210ebf8df5369472a96eb9faf652e13639f,943fe6026c64489e534df5c0827f4df7d5ee50fd..3d4346a73a8f7676e5f68df89ab8f0b4d49ade0b
@@@@ -11,7 -11,6 -11,8 +11,8 @@@@ ifdef CONFIG_FUNCTION_TRACE
   CFLAGS_REMOVE_tsc.o = -pg
   CFLAGS_REMOVE_rtc.o = -pg
   CFLAGS_REMOVE_paravirt-spinlocks.o = -pg
 + CFLAGS_REMOVE_ftrace.o = -pg
++ CFLAGS_REMOVE_early_printk.o = -pg
   endif
   
   #