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)
commita2fe194723f6e4990d01d8c208c7b138fd410522
tree7aee93fa8f4ba1e18b56fa7d8eab75d249fc6966
parentc3b7cdf180090d2686239a75bb0ae408108ed749
parenta018540141a931f5299a866907b27886916b4374
Merge branch 'linus' into perf/core

Pick up the latest ring-buffer fixes, before applying a new fix.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
include/linux/sched.h
kernel/trace/ring_buffer.c
tools/perf/util/session.c
tools/perf/util/trace-event-parse.c