From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 5 Aug 2014 09:27:25 +0000 (+0100)
Subject: Merge branch 'devel-stable' into for-next
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~160^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f15bdfe4fb264ac30d9c176f898cbd52cfd1ffa9;p=pandora-kernel.git

Merge branch 'devel-stable' into for-next

Conflicts:
	arch/arm/kernel/perf_event_cpu.c
---

f15bdfe4fb264ac30d9c176f898cbd52cfd1ffa9
Reading git-diff-tree failed