From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 3 Sep 2015 14:28:50 +0000 (+0100)
Subject: Merge branch 'devel-stable' into for-linus
X-Git-Tag: omap-for-v4.3/fixes-rc1~102^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ff32a0def6e0d2e21a6c5ad1b00726592774018;p=pandora-kernel.git

Merge branch 'devel-stable' into for-linus

Conflicts:
	drivers/perf/arm_pmu.c
---

3ff32a0def6e0d2e21a6c5ad1b00726592774018
Reading git-diff-tree failed