From: Ingo Molnar <mingo@kernel.org>
Date: Sun, 21 Apr 2013 08:57:33 +0000 (+0200)
Subject: Merge branch 'perf/urgent' into perf/core
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~119^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73e21ce28d8d2b75140b742b01373c3a085ecc52;p=pandora-kernel.git

Merge branch 'perf/urgent' into perf/core

Conflicts:
	arch/x86/kernel/cpu/perf_event_intel.c

Merge in the latest fixes before applying new patches, resolve the conflict.

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

73e21ce28d8d2b75140b742b01373c3a085ecc52
Reading git-diff-tree failed