Merge branch 'tracing/mmiotrace' into auto-ftrace-next
authorIngo Molnar <mingo@elte.hu>
Thu, 10 Jul 2008 09:43:06 +0000 (11:43 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 10 Jul 2008 09:43:06 +0000 (11:43 +0200)
commit5373fdbdc1dba69aa956098650f71b731d471885
tree8d9f07539896a696352818820c9c5f6612370882
parentbac0c9103b31c3dd83ad9d731dd9834e2ba75e4f
parent4d51c7587bb13dbb2fafcad6c0b5231bd864b55f
Merge branch 'tracing/mmiotrace' into auto-ftrace-next
kernel/trace/trace.c
kernel/trace/trace.h