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)
commited3982cf3748b657ffb79d9d1c2e4a562661db2d
tree6e3654f460e23aa1b1512896aa3f03886a69be1b
parentcba9bd22a5f8f857534b9a7f3fb3cafa0ac5fb75
parentd93dc5c4478c1fd5de85a3e8aece9aad7bbae044
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