Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Tue, 11 Nov 2008 08:58:36 +0000 (09:58 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 11 Nov 2008 08:58:36 +0000 (09:58 +0100)
commitd844222a54c33a960755b44b934cd1b01b05dceb
tree3ed56e3969ef2f1cccc921f3c49a959012ba1bda
parentf536aafc5a2e6f0c8f1577a155e6f93db5e469f0
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core