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-13 06:30:52 +01:00
commit d2e82546ae
4 changed files with 14 additions and 26 deletions