Merge branch 'tracing/ftrace' into tracing/urgent
commitdebfcaf93ed500a051489db6646d71f29fe86a68
authorIngo Molnar <mingo@elte.hu>
Wed, 22 Oct 2008 07:08:14 +0000 (22 09:08 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 22 Oct 2008 07:08:14 +0000 (22 09:08 +0200)
tree7ba189b6dd654022ecc655b68e3c0a4573627706
parent2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4
parent81520a1b0649d0701205b818714a8c1e1cfbbb5b
Merge branch 'tracing/ftrace' into tracing/urgent
arch/arm/Kconfig
arch/powerpc/Kconfig
arch/sparc64/Kconfig
arch/x86/Kconfig
arch/x86/kernel/Makefile
arch/x86/kernel/entry_32.S
kernel/Makefile
kernel/sysctl.c