Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@kernel.org>
Thu, 27 Feb 2014 11:41:17 +0000 (12:41 +0100)
committerIngo Molnar <mingo@kernel.org>
Thu, 27 Feb 2014 11:41:17 +0000 (12:41 +0100)
commitff5a7088f0f04dd246e514f898cab0c863c3598d
tree68a8f588e60fba05ee54b74b32a3269a72d130b9
parent7e74efcf76c16f851df5c838c143c4a1865ea9fa
parente3703f8cdfcf39c25c4338c3ad8e68891cca3731
Merge branch 'perf/urgent' into perf/core

Merge the latest fixes before queueing up new changes.

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