Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace

This commit is contained in:
Ingo Molnar 2009-02-10 13:58:28 +01:00
commit ae216dd239
2 changed files with 196 additions and 29 deletions