Commits

Merge branch 'perf/urgent' into perf/core, to resolve conflicts Conflicts: tools/perf/builtin-kmem.c Signed-off-by: Ingo Molnar <mingo@kernel.org>
Merge branch 'perf/urgent' into perf/core, to resolve conflicts Conflicts: tools/perf/builtin-kmem.c Signed-off-by: Ingo Molnar <mingo@kernel.org>