Merge branch 'tip/perf/ringbuffer-2' of git://git.kernel.org/pub/scm/linux/kernel...
authorIngo Molnar <mingo@elte.hu>
Tue, 26 Oct 2010 11:14:02 +0000 (13:14 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 26 Oct 2010 11:14:02 +0000 (13:14 +0200)
commit5c16d2c813a7490408e966f52b881e70fc8d7f77
tree3a2a4286a674d2e009f84687b5d0b74809774c28
parent5df414c61e1b6f15bdc3759f292c7404286c9827
parentb8b2663bd7c9da04ac804659b9f617c199d0252c
Merge branch 'tip/perf/ringbuffer-2' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
kernel/trace/ring_buffer.c