Merge tag 'v3.16-rc7' into perf/core, to merge in the latest fixes before applying...
authorIngo Molnar <mingo@kernel.org>
Mon, 28 Jul 2014 08:00:33 +0000 (10:00 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 28 Jul 2014 08:00:33 +0000 (10:00 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
arch/s390/include/uapi/asm/Kbuild
arch/x86/kernel/cpu/perf_event_intel_uncore.c
kernel/events/core.c

Simple merge
Simple merge