Merge branches 'tracing/ftrace' and 'tracing/hw-branch-tracing' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Thu, 18 Dec 2008 11:51:05 +0000 (12:51 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 18 Dec 2008 11:51:05 +0000 (12:51 +0100)
commit40874491f9e9a4cb08eaf663dbe018bf5671975a
tree0c212477aa6cb994a7c6702b5076748f95a1a118
parentd680fe44775ed17a80035462d9898f5e77bfd7dd
parentd072c25f531c6513994960401d2c7f059434c0d2
Merge branches 'tracing/ftrace' and 'tracing/hw-branch-tracing' into tracing/core