Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@kernel.org>
Thu, 21 Mar 2013 10:03:10 +0000 (11:03 +0100)
committerIngo Molnar <mingo@kernel.org>
Thu, 21 Mar 2013 10:03:10 +0000 (11:03 +0100)
Merge in all pending fixes, before pulling the latest development
bits from Arnaldo - which will involve merge conflicts.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
kernel/events/core.c

Simple merge