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)
commit5030c69755416d19516c0a61cd988a0e0062e041
treeca4d3088428cf033420f9df9111d796650bc59e5
parent2336ebc32676df5b794acfe0c980583ec6c05f34
parent64aa90f26c06e1cb2aacfb98a7d0eccfbd6c1a91
Merge tag 'v3.16-rc7' into perf/core, to merge in the latest fixes before applying new changes

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