]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
authorSteven Rostedt <srostedt@redhat.com>
Fri, 13 Mar 2009 01:12:46 +0000 (21:12 -0400)
committerSteven Rostedt <srostedt@redhat.com>
Fri, 13 Mar 2009 01:12:46 +0000 (21:12 -0400)
commitccfe4e25332143b9ee46caafbfbd4ef5e7ce3e1e
treeae71fcbd8b3640b68fc11e1dca620a8ee96bac5f
parent2c51398224a4925fb7729c5739bdfaa5e7fc8b32
parent16a162127ab5ad7de2531c856957054678781892
Merge branch 'tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/ftrace-merge
kernel/trace/trace.c