Merge branches 'tracing/blktrace', 'tracing/ftrace' and 'tracing/urgent' into tracing...
authorIngo Molnar <mingo@elte.hu>
Thu, 19 Feb 2009 09:20:17 +0000 (10:20 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 19 Feb 2009 09:20:17 +0000 (10:20 +0100)
commit40999096e8b9872199bf56ecd0c4d98397ccaf2f
treea1019965100c10cae52014c447bfb4d1381ebec9
parent72c26c9a26ea7f2f3d14f162c2ebb07805f724ea
parentfa7c7f6e11f70d62505074a8b30a776236850dec
parented4a2f374d71770796789ed559c35a36bab82f1a
Merge branches 'tracing/blktrace', 'tracing/ftrace' and 'tracing/urgent' into tracing/core
kernel/trace/Kconfig
kernel/trace/trace_selftest.c