]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
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)
commitaa0e5d0850376b8f619bc4cc55c374f414fde80f
tree5ccafb8e628af649b2e9b896508aa0fadbfdde8a
parent12f7e740bb7dd270768fbd2307e7eafcf6b5e2d0
parent733dbbd781640f29ad433542454fb6fe61d962d9
Merge remote-tracking branch 'slave-dma/next'

Conflicts:
arch/arm/mach-shmobile/board-ape6evm.c
arch/arm/mach-shmobile/board-mackerel.c
MAINTAINERS
arch/arm64/boot/dts/apm/apm-storm.dtsi