Merge branch 'tracing/urgent' into tracing/ftrace
authorIngo Molnar <mingo@elte.hu>
Tue, 11 Nov 2008 08:40:18 +0000 (09:40 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 11 Nov 2008 08:40:18 +0000 (09:40 +0100)
commite0cb4ebcd9e5b4ddd8216c20f54445c91b1fa4b9
treed1c3b22b7e9f02fb56927da530da09c6ee7ce0b9
parenta309720c876d7ad2e224bfd1982c92ae4364c82e
parent45b86a96f17cb2900f291129b0e67287400e45b2
Merge branch 'tracing/urgent' into tracing/ftrace

Conflicts:
kernel/trace/trace.c
Documentation/kernel-parameters.txt
arch/x86/Kconfig
kernel/trace/ring_buffer.c
kernel/trace/trace.c