Merge branch 'perf-core-for-mingo' into perf/urgent
authorIngo Molnar <mingo@kernel.org>
Mon, 14 Apr 2014 14:45:39 +0000 (16:45 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 14 Apr 2014 14:45:39 +0000 (16:45 +0200)
Conflicts:
tools/perf/bench/numa.c

Pull perf fixes from Jiri Olsa.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge