tree 79b2b4e060a97b1e7c60d58549f8c97cb15db5dd
parent 0e73453e172aaa38fd59fd4d3fc589e8fc9b9a70
parent 215432ed30393ed4a8f77db0a1fe34523c48cdba
author Ingo Molnar <mingo@kernel.org> 1383547775 +0100
committer Ingo Molnar <mingo@kernel.org> 1383547775 +0100

Merge branch 'perf/urgent' into perf/core to fix conflicts

Conflicts:
	tools/perf/bench/numa.c

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