Merge branch 'tracing/ftrace' into auto-ftrace-next
authorIngo Molnar <mingo@elte.hu>
Thu, 10 Jul 2008 09:43:00 +0000 (11:43 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 10 Jul 2008 09:43:00 +0000 (11:43 +0200)
commitbac0c9103b31c3dd83ad9d731dd9834e2ba75e4f
tree702dd6a7ce06d224d594c2293af546b11ac9f51b
parent6329d3021bcfa9038621e6e917d98929421d8ec8
parent98a05ed4bd7774f533ab185fe0bf2fdc58292d7c
Merge branch 'tracing/ftrace' into auto-ftrace-next
Makefile
arch/x86/Kconfig
arch/x86/mm/init_64.c
kernel/printk.c
kernel/sched.c