From: Olof Johansson Date: Tue, 31 Jan 2017 05:22:37 +0000 (-0800) Subject: Merge tag 'at91-ab-4.10-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abellon... X-Git-Tag: v4.10-rc8~25^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=36e854c3b8e17db0e9ace2c603d492b71d53b5cd;p=platform%2Fkernel%2Flinux-exynos.git Merge tag 'at91-ab-4.10-soc' of git://git./linux/kernel/git/abelloni/linux into fixes AT91 SoC fixes for 4.10: - change email addresses for Nicolas and Ludovic following the Microchip-Atmel merger * tag 'at91-ab-4.10-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: MAINTAINERS: change email address from atmel to microchip MAINTAINERS: at91: change email address Signed-off-by: Olof Johansson --- 36e854c3b8e17db0e9ace2c603d492b71d53b5cd diff --cc MAINTAINERS index 26edd83,eb9739e..acd7c3d --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -2196,8 -2194,16 +2196,8 @@@ L: alsa-devel@alsa-project.org (moderat S: Supported F: sound/soc/atmel -ATMEL DMA DRIVER -M: Nicolas Ferre -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -S: Supported -F: drivers/dma/at_hdmac.c -F: drivers/dma/at_hdmac_regs.h -F: include/linux/platform_data/dma-atmel.h - ATMEL XDMA DRIVER - M: Ludovic Desroches + M: Ludovic Desroches L: linux-arm-kernel@lists.infradead.org L: dmaengine@vger.kernel.org S: Supported