Merge branch 'devel-stable' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 12 Jun 2015 20:18:57 +0000 (21:18 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 12 Jun 2015 20:18:57 +0000 (21:18 +0100)
commit27a513ca8600e96790f9f3a3c3182da947e569d2
tree48319c0a53dd76dc2dff6cb15da5c5f145e72cc3
parent970d96f9a81b0dd83ddd8bce0e5e1ba31881c5f5
parentbcc8fa83136969c340a8057c44b1d5eb2f4b5295
Merge branch 'devel-stable' into for-next

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