]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 03:33:41 +0000 (13:33 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 03:33:41 +0000 (13:33 +1000)
Conflicts:
arch/arm/mach-shmobile/board-ape6evm.c
arch/arm/mach-shmobile/board-mackerel.c

1  2 
MAINTAINERS
arch/arm64/boot/dts/apm/apm-storm.dtsi

diff --cc MAINTAINERS
Simple merge