tree 255e1e24bcf089d584e45ea8a733883c1bb4d74c
parent 32b0ed3ae66cd6114f8510161f833f05518c0395
parent 44b11fee51711ca85aa2b121a49bf029d18a3722
author Ingo Molnar <mingo@kernel.org> 1431338187 +0200
committer Ingo Molnar <mingo@kernel.org> 1431338187 +0200

Merge branch 'perf/urgent' into perf/core, to resolve conflicts

Conflicts:
	tools/perf/builtin-kmem.c

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