Merge branch 'tracing/urgent' into tracing/ftrace
authorIngo Molnar <mingo@elte.hu>
Tue, 7 Apr 2009 12:41:14 +0000 (14:41 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 7 Apr 2009 12:41:17 +0000 (14:41 +0200)
commit86665c75da41889f92b774f31ea5a9a436f392a8
tree94b003ab677a64b7d0a6dcca1f636bbbc2a187c9
parent93776a8ec746cf9d32c36e5a5b23d28d8be28826
parent1bbe2a83ab68e5cf8c66c372c7cb3b51910c2cfe
Merge branch 'tracing/urgent' into tracing/ftrace
block/blk-core.c
include/linux/ftrace.h
include/linux/init_task.h
kernel/trace/trace.c
kernel/trace/trace.h
kernel/trace/trace_output.c