From: Ingo Molnar Date: Mon, 11 May 2015 09:56:27 +0000 (+0200) Subject: Merge branch 'perf/urgent' into perf/core, to resolve conflicts X-Git-Tag: v4.2-rc1~177^2~46 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f7dc7fd1c08c6d8109688694fd93d80645df89ff;p=linux.git Merge branch 'perf/urgent' into perf/core, to resolve conflicts Conflicts: tools/perf/builtin-kmem.c Signed-off-by: Ingo Molnar --- f7dc7fd1c08c6d8109688694fd93d80645df89ff