Merge branch 'linus' into perf/core, to fix conflicts
authorIngo Molnar <mingo@kernel.org>
Sun, 24 Aug 2014 20:32:24 +0000 (22:32 +0200)
committerIngo Molnar <mingo@kernel.org>
Sun, 24 Aug 2014 20:32:24 +0000 (22:32 +0200)
commit83bc90e11576f9c100f8ef4ba2bcd0b89212e3fb
treee59186b4d315c80255851e0d204143ecc21399a0
parente21ded5ecc531a64d6fc0c1693285e890b4e9569
parent451fd72219dd6f3355e2d036c598544c760ee532
Merge branch 'linus' into perf/core, to fix conflicts

Conflicts:
arch/x86/kernel/cpu/perf_event_intel_uncore*.c

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