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 --combined MAINTAINERS
index 26edd832c64ed14d0939897194ca1d9e103c76e5,eb9739ec4e9257e691b0a7bd23d10db76de441b2..acd7c3d5410aa755c717cc156aadc1cf6de6df36
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -81,6 -81,7 +81,6 @@@ Descriptions of section entries
        Q: Patchwork web based patch tracking system site
        T: SCM tree type and location.
           Type is one of: git, hg, quilt, stgit, topgit
 -      B: Bug tracking system location.
        S: Status, one of the following:
           Supported:   Someone is actually paid to look after this.
           Maintained:  Someone actually looks after it.
@@@ -976,7 -977,6 +976,7 @@@ M: Russell King <linux@armlinux.org.uk
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.armlinux.org.uk/
  S:    Maintained
 +T:    git git://git.armlinux.org.uk/~rmk/linux-arm.git
  F:    arch/arm/
  
  ARM SUB-ARCHITECTURES
@@@ -1091,7 -1091,7 +1091,7 @@@ F:      arch/arm/boot/dts/aspeed-
  F:    drivers/*/*aspeed*
  
  ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
- M:    Nicolas Ferre <nicolas.ferre@atmel.com>
+ M:    Nicolas Ferre <nicolas.ferre@microchip.com>
  M:    Alexandre Belloni <alexandre.belloni@free-electrons.com>
  M:    Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1154,7 -1154,6 +1154,7 @@@ ARM/CLKDEV SUPPOR
  M:    Russell King <linux@armlinux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 +T:    git git://git.armlinux.org.uk/~rmk/linux-arm.git clkdev
  F:    arch/arm/include/asm/clkdev.h
  F:    drivers/clk/clkdev.c
  
@@@ -1690,7 -1689,6 +1690,7 @@@ M:      Krzysztof Kozlowski <krzk@kernel.org
  R:    Javier Martinez Canillas <javier@osg.samsung.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
 +Q:    https://patchwork.kernel.org/project/linux-samsung-soc/list/
  S:    Maintained
  F:    arch/arm/boot/dts/s3c*
  F:    arch/arm/boot/dts/s5p*
@@@ -2175,56 -2173,64 +2175,56 @@@ F:   include/linux/atm
  F:    include/uapi/linux/atm*
  
  ATMEL AT91 / AT32 MCI DRIVER
- M:    Ludovic Desroches <ludovic.desroches@atmel.com>
+ M:    Ludovic Desroches <ludovic.desroches@microchip.com>
  S:    Maintained
  F:    drivers/mmc/host/atmel-mci.c
  
  ATMEL AT91 SAMA5D2-Compatible Shutdown Controller
- M:    Nicolas Ferre <nicolas.ferre@atmel.com>
+ M:    Nicolas Ferre <nicolas.ferre@microchip.com>
  S:    Supported
  F:    drivers/power/reset/at91-sama5d2_shdwc.c
  
  ATMEL SAMA5D2 ADC DRIVER
- M:    Ludovic Desroches <ludovic.desroches@atmel.com>
+ M:    Ludovic Desroches <ludovic.desroches@microchip.com>
  L:    linux-iio@vger.kernel.org
  S:    Supported
  F:    drivers/iio/adc/at91-sama5d2_adc.c
  
  ATMEL Audio ALSA driver
- M:    Nicolas Ferre <nicolas.ferre@atmel.com>
+ M:    Nicolas Ferre <nicolas.ferre@microchip.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  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
  F:    drivers/dma/at_xdmac.c
  
  ATMEL I2C DRIVER
- M:    Ludovic Desroches <ludovic.desroches@atmel.com>
+ M:    Ludovic Desroches <ludovic.desroches@microchip.com>
  L:    linux-i2c@vger.kernel.org
  S:    Supported
  F:    drivers/i2c/busses/i2c-at91.c
  
  ATMEL ISI DRIVER
- M:    Ludovic Desroches <ludovic.desroches@atmel.com>
+ M:    Ludovic Desroches <ludovic.desroches@microchip.com>
  L:    linux-media@vger.kernel.org
  S:    Supported
  F:    drivers/media/platform/soc_camera/atmel-isi.c
  F:    include/media/atmel-isi.h
  
  ATMEL LCDFB DRIVER
- M:    Nicolas Ferre <nicolas.ferre@atmel.com>
+ M:    Nicolas Ferre <nicolas.ferre@microchip.com>
  L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    drivers/video/fbdev/atmel_lcdfb.c
  F:    include/video/atmel_lcdc.h
  
  ATMEL MACB ETHERNET DRIVER
- M:    Nicolas Ferre <nicolas.ferre@atmel.com>
+ M:    Nicolas Ferre <nicolas.ferre@microchip.com>
  S:    Supported
  F:    drivers/net/ethernet/cadence/
  
@@@ -2236,32 -2242,32 +2236,32 @@@ S:   Supporte
  F:    drivers/mtd/nand/atmel_nand*
  
  ATMEL SDMMC DRIVER
- M:    Ludovic Desroches <ludovic.desroches@atmel.com>
+ M:    Ludovic Desroches <ludovic.desroches@microchip.com>
  L:    linux-mmc@vger.kernel.org
  S:    Supported
  F:    drivers/mmc/host/sdhci-of-at91.c
  
  ATMEL SPI DRIVER
- M:    Nicolas Ferre <nicolas.ferre@atmel.com>
+ M:    Nicolas Ferre <nicolas.ferre@microchip.com>
  S:    Supported
  F:    drivers/spi/spi-atmel.*
  
  ATMEL SSC DRIVER
- M:    Nicolas Ferre <nicolas.ferre@atmel.com>
+ M:    Nicolas Ferre <nicolas.ferre@microchip.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  F:    drivers/misc/atmel-ssc.c
  F:    include/linux/atmel-ssc.h
  
  ATMEL Timer Counter (TC) AND CLOCKSOURCE DRIVERS
- M:    Nicolas Ferre <nicolas.ferre@atmel.com>
+ M:    Nicolas Ferre <nicolas.ferre@microchip.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  F:    drivers/misc/atmel_tclib.c
  F:    drivers/clocksource/tcb_clksrc.c
  
  ATMEL USBA UDC DRIVER
- M:    Nicolas Ferre <nicolas.ferre@atmel.com>
+ M:    Nicolas Ferre <nicolas.ferre@microchip.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  F:    drivers/usb/gadget/udc/atmel_usba_udc.*
@@@ -3794,7 -3800,6 +3794,7 @@@ F:      include/linux/devcoredump.
  DEVICE FREQUENCY (DEVFREQ)
  M:    MyungJoo Ham <myungjoo.ham@samsung.com>
  M:    Kyungmin Park <kyungmin.park@samsung.com>
 +R:    Chanwoo Choi <cw00.choi@samsung.com>
  L:    linux-pm@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
  S:    Maintained
@@@ -4111,7 -4116,7 +4111,7 @@@ F:      drivers/gpu/drm/cirrus
  RADEON and AMDGPU DRM DRIVERS
  M:    Alex Deucher <alexander.deucher@amd.com>
  M:    Christian König <christian.koenig@amd.com>
 -L:    dri-devel@lists.freedesktop.org
 +L:    amd-gfx@lists.freedesktop.org
  T:    git git://people.freedesktop.org/~agd5f/linux
  S:    Supported
  F:    drivers/gpu/drm/radeon/
@@@ -5075,11 -5080,9 +5075,11 @@@ F:    drivers/net/wan/dlci.
  F:    drivers/net/wan/sdla.c
  
  FRAMEBUFFER LAYER
 +M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
  L:    linux-fbdev@vger.kernel.org
 +T:    git git://github.com/bzolnier/linux.git
  Q:    http://patchwork.kernel.org/project/linux-fbdev/list/
 -S:    Orphan
 +S:    Maintained
  F:    Documentation/fb/
  F:    drivers/video/
  F:    include/video/
@@@ -5501,7 -5504,6 +5501,7 @@@ M:      Alex Elder <elder@kernel.org
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  S:    Maintained
  F:    drivers/staging/greybus/
 +L:    greybus-dev@lists.linaro.org
  
  GREYBUS AUDIO PROTOCOLS DRIVERS
  M:    Vaibhav Agarwal <vaibhav.sr@gmail.com>
@@@ -5959,7 -5961,6 +5959,7 @@@ F:      drivers/media/platform/sti/hv
  Hyper-V CORE AND DRIVERS
  M:    "K. Y. Srinivasan" <kys@microsoft.com>
  M:    Haiyang Zhang <haiyangz@microsoft.com>
 +M:    Stephen Hemminger <sthemmin@microsoft.com>
  L:    devel@linuxdriverproject.org
  S:    Maintained
  F:    arch/x86/include/asm/mshyperv.h
@@@ -7700,10 -7701,8 +7700,10 @@@ F:    drivers/net/dsa/mv88e6xxx
  F:    Documentation/devicetree/bindings/net/dsa/marvell.txt
  
  MARVELL ARMADA DRM SUPPORT
 -M:    Russell King <rmk+kernel@armlinux.org.uk>
 +M:    Russell King <linux@armlinux.org.uk>
  S:    Maintained
 +T:    git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-armada-devel
 +T:    git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-armada-fixes
  F:    drivers/gpu/drm/armada/
  F:    include/uapi/drm/armada_drm.h
  F:    Documentation/devicetree/bindings/display/armada/
@@@ -8175,15 -8174,6 +8175,15 @@@ S:    Maintaine
  F:    drivers/tty/serial/atmel_serial.c
  F:    include/linux/atmel_serial.h
  
 +MICROCHIP / ATMEL DMA DRIVER
 +M:    Ludovic Desroches <ludovic.desroches@microchip.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +L:    dmaengine@vger.kernel.org
 +S:    Supported
 +F:    drivers/dma/at_hdmac.c
 +F:    drivers/dma/at_hdmac_regs.h
 +F:    include/linux/platform_data/dma-atmel.h
 +
  MICROCHIP / ATMEL ISC DRIVER
  M:    Songjun Wu <songjun.wu@microchip.com>
  L:    linux-media@vger.kernel.org
@@@ -8862,22 -8852,17 +8862,22 @@@ F:   drivers/video/fbdev/nvidia
  NVM EXPRESS DRIVER
  M:    Keith Busch <keith.busch@intel.com>
  M:    Jens Axboe <axboe@fb.com>
 +M:    Christoph Hellwig <hch@lst.de>
 +M:    Sagi Grimberg <sagi@grimberg.me>
  L:    linux-nvme@lists.infradead.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
 -W:    https://kernel.googlesource.com/pub/scm/linux/kernel/git/axboe/linux-block/
 +T:    git://git.infradead.org/nvme.git
 +W:    http://git.infradead.org/nvme.git
  S:    Supported
  F:    drivers/nvme/host/
  F:    include/linux/nvme.h
 +F:    include/uapi/linux/nvme_ioctl.h
  
  NVM EXPRESS TARGET DRIVER
  M:    Christoph Hellwig <hch@lst.de>
  M:    Sagi Grimberg <sagi@grimberg.me>
  L:    linux-nvme@lists.infradead.org
 +T:    git://git.infradead.org/nvme.git
 +W:    http://git.infradead.org/nvme.git
  S:    Supported
  F:    drivers/nvme/target/
  
@@@ -8908,10 -8893,8 +8908,10 @@@ S:    Supporte
  F:    drivers/nfc/nxp-nci
  
  NXP TDA998X DRM DRIVER
 -M:    Russell King <rmk+kernel@armlinux.org.uk>
 +M:    Russell King <linux@armlinux.org.uk>
  S:    Supported
 +T:    git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-devel
 +T:    git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-fixes
  F:    drivers/gpu/drm/i2c/tda998x_drv.c
  F:    include/drm/i2c/tda998x.h
  
@@@ -9727,7 -9710,7 +9727,7 @@@ S:      Maintaine
  F:    drivers/pinctrl/pinctrl-at91.*
  
  PIN CONTROLLER - ATMEL AT91 PIO4
- M:    Ludovic Desroches <ludovic.desroches@atmel.com>
+ M:    Ludovic Desroches <ludovic.desroches@microchip.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-gpio@vger.kernel.org
  S:    Supported
@@@ -9859,7 -9842,7 +9859,7 @@@ M:      Mark Rutland <mark.rutland@arm.com
  M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
  L:    linux-arm-kernel@lists.infradead.org
  S:    Maintained
 -F:    drivers/firmware/psci.c
 +F:    drivers/firmware/psci*.c
  F:    include/linux/psci.h
  F:    include/uapi/linux/psci.h
  
@@@ -13544,11 -13527,11 +13544,11 @@@ F:        arch/x86/xen/*swiotlb
  F:    drivers/xen/*swiotlb*
  
  XFS FILESYSTEM
 -M:    Dave Chinner <david@fromorbit.com>
 +M:    Darrick J. Wong <darrick.wong@oracle.com>
  M:    linux-xfs@vger.kernel.org
  L:    linux-xfs@vger.kernel.org
  W:    http://xfs.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git
 +T:    git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
  S:    Supported
  F:    Documentation/filesystems/xfs.txt
  F:    fs/xfs/