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)
commitfafd883f671dfc1c2f62009179920f27abc784a1
tree0eccb0baf343cad79a54e352598921db9ca17620
parent92519bbc8af612975410def52bd462ca9af85cdb
parentd8b11a0cbd1c66ce283eb9dabe0498dfa6483f32
Merge branch 'perf/urgent' into perf/core

Pick up the latest fixes before applying new patches.

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