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-03-02 22:38:31 +01:00
commit ed662d9b2a
7 changed files with 188 additions and 15 deletions