Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Fri, 13 Mar 2009 03:34:09 +0000 (04:34 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 13 Mar 2009 03:34:09 +0000 (04:34 +0100)
commit2084e0225ed14cc1959c8aa703a3870c95fde4ab
tree818517eb07b585e981ce81c200294a8ec7a8e992
parent4c6ed8f496fe89ff81b3d6e617a531bedfb613e4
parent5cc985488845ec7227a2c5cfd2fd62cf57fb411a
Merge branch 'tip/tracing/ftrace' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace