Merge branch 'linus' into perf/core
authorIngo Molnar <mingo@kernel.org>
Wed, 18 Jul 2012 09:17:17 +0000 (11:17 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 18 Jul 2012 09:17:17 +0000 (11:17 +0200)
Pick up the latest ring-buffer fixes, before applying a new fix.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge