Merge branches 'tracing/ftrace' and 'tracing/hw-branch-tracing' into tracing/core

This commit is contained in:
Ingo Molnar 2008-12-18 12:51:05 +01:00
commit 40874491f9