]> git.baikalelectronics.ru Git - kernel.git/commit
Merge commit 'v3.1-rc7' into perf/core
authorIngo Molnar <mingo@elte.hu>
Mon, 26 Sep 2011 10:53:42 +0000 (12:53 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 26 Sep 2011 10:54:28 +0000 (12:54 +0200)
commit5b7ec2d9980a5a4891314583fc3a943beccec057
tree6e3654f460e23aa1b1512896aa3f03886a69be1b
parent999d5b61fccb3902f33f28c4086901cad8247ba6
parent8dc188e3006905516183897835fc848e4f79d37a
Merge commit 'v3.1-rc7' into perf/core

Merge reason: Pick up the latest upstream fixes.

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