Merge branch 'tip/tracing/ftrace' of ssh://master.kernel.org/pub/scm/linux/kernel...
authorIngo Molnar <mingo@elte.hu>
Thu, 26 Feb 2009 02:48:44 +0000 (03:48 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 26 Feb 2009 02:48:44 +0000 (03:48 +0100)
commitf4abfb8d0da70e436013e5799338357e1e6a0832
tree55f087b8e29f64694de84afa09563ad2c0acdd42
parente36b1e136aa8f8c42fa6b96848c9c6bcaf2c269c
parent3cdfdf91fcc77cfc82592e2b5c2ab35abe819c41
Merge branch 'tip/tracing/ftrace' of ssh:///linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace