Merge tag 'at91-ab-4.10-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abellon...

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 <olof@lixom.net>

diff --cc MAINTAINERS
index 26edd832c64ed14d0939897194ca1d9e103c76e5,eb9739ec4e9257e691b0a7bd23d10db76de441b2..acd7c3d5410aa755c717cc156aadc1cf6de6df36
--- 1/MAINTAINERS
--- 2/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 <nicolas.ferre@atmel.com>
 -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 <ludovic.desroches@atmel.com>
+ M:    Ludovic Desroches <ludovic.desroches@microchip.com>
  L:    linux-arm-kernel@lists.infradead.org
  L:    dmaengine@vger.kernel.org
  S:    Supported