Merge branch 'for-arm-soc' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 12 Jun 2015 20:18:59 +0000 (21:18 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 12 Jun 2015 20:18:59 +0000 (21:18 +0100)
commita9dd3865dd1bd996a7e6af808645b7e566ced009
tree4a11fe3663f1e7c375bb8d33af85d8b1ad5e5ad5
parent27a513ca8600e96790f9f3a3c3182da947e569d2
parent2678bb9fa137726a0b83dd61a9c1636543066755
Merge branch 'for-arm-soc' into for-next
arch/arm/kernel/sleep.S
arch/arm/mm/proc-v7.S