Merge branch 'devel-stable' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 3 Sep 2015 14:28:50 +0000 (15:28 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 3 Sep 2015 14:28:50 +0000 (15:28 +0100)
commit3ff32a0def6e0d2e21a6c5ad1b00726592774018
treeaf683b2cb62f7e5ee18cb109d15dcfd43769b984
parent40d3f02851577da27b5cbb1538888301245ef1e7
parent81497953e37bc28209d9a647171ea93b4a99fc57
Merge branch 'devel-stable' into for-linus

Conflicts:
drivers/perf/arm_pmu.c
arch/arm/Kconfig
arch/arm/kernel/setup.c