Commit 36e854c3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-ab-4.10-soc' of... 

Merge tag 'at91-ab-4.10-soc' of git://git.kernel.org/pub/scm/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: default avatarOlof Johansson <olof@lixom.net>
parents 0a019a28 420a3879

MAINTAINERS

+16 −16
Original line number Diff line number Diff line
@@ -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)
@@ -2175,56 +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 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 +2236,32 @@ S: Supported 
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.*
@@ -9727,7 +9727,7 @@ S: Maintained 
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

CRA Git | Maintained and supported by SUSTech CRA and CCSE