Merge branch 'sa1100-for-next'; commit 'riscpc^{/ARM: riscpc: enable chained scatterl...

author Russell King <rmk+kernel@armlinux.org.uk>

Wed, 3 Jul 2019 10:44:46 +0000 (11:44 +0100)

committer Russell King <rmk+kernel@armlinux.org.uk>

Wed, 3 Jul 2019 10:44:46 +0000 (11:44 +0100)
author Russell King <rmk+kernel@armlinux.org.uk>
Wed, 3 Jul 2019 10:44:46 +0000 (11:44 +0100)
committer Russell King <rmk+kernel@armlinux.org.uk>
Wed, 3 Jul 2019 10:44:46 +0000 (11:44 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/mach-rpc/Makefile
Simple merge
diff --cc arch/arm/mach-rpc/dma.c
Simple merge
author	Russell King <rmk+kernel@armlinux.org.uk>
	Wed, 3 Jul 2019 10:44:46 +0000 (11:44 +0100)
committer	Russell King <rmk+kernel@armlinux.org.uk>
	Wed, 3 Jul 2019 10:44:46 +0000 (11:44 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rpc/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-rpc/dma.c	patch \|	diff1 \|	diff2 \|	blob \| history