Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Tue, 10 Feb 2009 12:25:42 +0000 (13:25 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 10 Feb 2009 12:25:42 +0000 (13:25 +0100)
commitf9915bfef3c64ea0b0b960dd1b999b584a7ef460
treeec8d1c35a542e4c8e08b5a2be380b2bdef9a10d0
parentb91facc367366b3f71375f337eb5997ec9ab4e69
parentacd895795d35d7c6405f20301a846d16998795ec
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core