Merge branch 'tip/tracing/ring-buffer-3' of git://git.kernel.org/pub/scm/linux/kernel...
authorIngo Molnar <mingo@elte.hu>
Fri, 10 Jul 2009 11:30:06 +0000 (13:30 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 10 Jul 2009 11:30:06 +0000 (13:30 +0200)
commite202687927c132b1e1ff36b526b5e78ac33de840
tree8c1cadd560913e41237af48fc0058a9ed640dda7
parenta35780005eb256eb5ec83ffcc802967295887a45
parent8b2c70d1e43074cc06afe99b0de12b686d9c9d02
Merge branch 'tip/tracing/ring-buffer-3' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/core