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)
commitacd632eb64b6cd8e25583bb248c36aa937b8f021
tree993d276cbadb450fe8cf5e3c66d444a905d452e7
parent4b0c53e9e1a2a785746b2d379a32cb70b4dbb2fd
parent5542b2aa9eea3f2bb922029c8cc4b4346c4f6b1c
Merge branch 'perf/urgent' into perf/core, to merge fixes before pulling more changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/events/core.c
tools/perf/config/Makefile