Merge branch 'linus' into perf/urgent
authorIngo Molnar <mingo@kernel.org>
Mon, 26 Mar 2012 15:18:44 +0000 (17:18 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 26 Mar 2012 15:19:03 +0000 (17:19 +0200)
commit7fd52392c56361a40f0c630a82b36b95ca31eac6
tree14091de24c6b28ea4cae9826f98aeedb7be091f5
parentb01c3a0010aabadf745f3e7fdb9cab682e0a28a2
parente22057c8599373e5caef0bc42bdb95d2a361ab0d
Merge branch 'linus' into perf/urgent

Merge reason: we need to fix a non-trivial merge conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/cpu/perf_event.c
include/linux/kernel.h
kernel/events/core.c