]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit87aec91b8040ba3b4bf1b0a08a12e5d7b04a54ed
tree14091de24c6b28ea4cae9826f98aeedb7be091f5
parent0b5e0e3cab18987631782f004b034f8015cfb837
parent1fddad4f1e1e71fdeab5566e30156ed92d504e40
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