From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 29 Oct 2013 10:23:32 +0000 (+0100)
Subject: Merge branch 'perf/urgent' into perf/core
X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~41^2~24
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aac898548d04c7bff179b79f805874b0d6f87571;p=pandora-kernel.git

Merge branch 'perf/urgent' into perf/core

Conflicts:
	tools/perf/builtin-record.c
	tools/perf/builtin-top.c
	tools/perf/util/hist.h
---

aac898548d04c7bff179b79f805874b0d6f87571
Reading git-diff-tree failed