Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
authorIngo Molnar <mingo@elte.hu>
Tue, 13 Oct 2009 10:03:08 +0000 (12:03 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 13 Oct 2009 10:03:08 +0000 (12:03 +0200)
commit1bac0497ef9af8d933860672223e38bd6ac4934a
tree8e569b0e7ed977a4659002632362855cc245990f
parent2c96c142e941041973faab20ca3b82d57f435c5e
parentbf7c5b43a12614847b83f507fb169ad30640e406
Merge branch 'tracing/core' of git://git./linux/kernel/git/frederic/random-tracing into tracing/core
kernel/trace/ftrace.c
kernel/trace/trace.c