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-11 10:03:53 +01:00
commit 4040068dce
8 changed files with 42 additions and 39 deletions