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)
commitfbdd17ec5ce2e5e4027356fcfde769b88d15702f
treed655577d9bb40b7c9a03d35b513fd9a1bbfe431d
parent740c699a8d316c8bf8593f19e2ca47795e690622
parent90f6bb6c98ffef42125d7be6d4612505f561fbce
Merge branch 'perf-core-for-mingo' into perf/urgent

Conflicts:
tools/perf/bench/numa.c

Pull perf fixes from Jiri Olsa.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
MAINTAINERS
tools/perf/bench/numa.c