From: Ingo Molnar <mingo@kernel.org>
Date: Sun, 24 Aug 2014 20:32:24 +0000 (+0200)
Subject: Merge branch 'linus' into perf/core, to fix conflicts
X-Git-Tag: omap-for-v3.19/prcm-cleanup~97^2~26
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83bc90e11576f9c100f8ef4ba2bcd0b89212e3fb;p=pandora-kernel.git

Merge branch 'linus' into perf/core, to fix conflicts

Conflicts:
	arch/x86/kernel/cpu/perf_event_intel_uncore*.c

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

83bc90e11576f9c100f8ef4ba2bcd0b89212e3fb
Reading git-diff-tree failed