Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core

This commit is contained in:
Ingo Molnar 2009-02-18 01:08:13 +01:00
commit 37bd824a35