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

This commit is contained in:
Ingo Molnar 2009-02-11 10:03:11 +01:00
commit d524e03207