Merge branch 'perf/urgent' into perf/core, to merge fixes before pulling more changes
authorIngo Molnar <mingo@kernel.org>
Fri, 31 Jul 2015 07:59:28 +0000 (09:59 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 31 Jul 2015 07:59:28 +0000 (09:59 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
kernel/events/core.c
tools/perf/config/Makefile

Simple merge
Simple merge