Merge branch 'tip/tracing/core' 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-13 11:02:40 +01:00
commit 5fb896a4e9
4 changed files with 40 additions and 74 deletions