Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@kernel.org>
Fri, 4 Oct 2013 07:59:13 +0000 (09:59 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 4 Oct 2013 07:59:13 +0000 (09:59 +0200)
Pick up the latest fixes before applying new patches.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
arch/x86/kernel/cpu/perf_event_intel.c
arch/x86/kernel/cpu/perf_event_intel_ds.c