Merge branch 'perf/urgent' into perf/core, to pick up fixes before applying new changes
authorIngo Molnar <mingo@kernel.org>
Wed, 12 Aug 2015 09:39:19 +0000 (11:39 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 12 Aug 2015 09:39:19 +0000 (11:39 +0200)
commit3d325bf0da91ca5d22f2525a72308dafd4fc0977
treeb6b5633538f4fd880dd26ca362f2d7aa4e9dd128
parentf1d800bf615b84ca253af372d2dac8cdef743a20
parentd7a702f0b1033cf402fef65bd6395072738f0844
Merge branch 'perf/urgent' into perf/core, to pick up fixes before applying new changes

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