Merge remote-tracking branch 'slave-dma/next'

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/dma/amba-pl08x.c
Simple merge

diff --cc drivers/dma/edma.c
Simple merge

diff --cc drivers/dma/imx-sdma.c
Simple merge

diff --cc drivers/dma/pl330.c
Simple merge

diff --cc drivers/tty/serial/sh-sci.c
Simple merge