tree 3ed56e3969ef2f1cccc921f3c49a959012ba1bda
parent f536aafc5a2e6f0c8f1577a155e6f93db5e469f0
author Ingo Molnar <mingo@elte.hu> 1226393916 +0100
committer Ingo Molnar <mingo@elte.hu> 1226393916 +0100

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