From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 28 Jan 2015 14:48:59 +0000 (+0100)
Subject: Merge branch 'perf/hw_breakpoints' into perf/core
X-Git-Tag: fixes-v4.0-rc1~180^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3890e4704594fa23abe1395d1fafc97d3214be8;p=pandora-kernel.git

Merge branch 'perf/hw_breakpoints' into perf/core

The new hw_breakpoint bits are now ready for v3.20, merge them
into the main branch, to avoid conflicts.

Conflicts:
	tools/perf/Documentation/perf-record.txt

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

b3890e4704594fa23abe1395d1fafc97d3214be8
Reading git-diff-tree failed