Commit 8adcb0ff authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-3.5-maintainers' of git://github.com/at91linux/linux-at91 into next/maintainers

Nicolas Ferre <nicolas.ferre@atmel.com> writes:
  Here are some additions to the MAINTAINERS file regarding AT91 related drivers.
  Josh and I are adding entries for drivers that we have been taking care of
  for quite some time.

* tag 'at91-3.5-maintainers' of git://github.com/at91linux/linux-at91

:
  MAINTAINERS: remove non-responding web link for atmel_usba driver
  MAINTAINERS: add entry for Atmel timer counter (TC)
  MAINTAINERS: add entry for Atmel DMA driver
  MAINTAINERS: add entry for Atmel touch screen ADC controller driver
  MAINTAINERS: add entry for Atmel isi driver

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents e816b57a 1066c51e
Loading
Loading
Loading
Loading
+28 −1
Original line number Diff line number Diff line
@@ -1331,6 +1331,21 @@ M: Nicolas Ferre <nicolas.ferre@atmel.com>
S:	Supported
F:	drivers/tty/serial/atmel_serial.c

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:	arch/arm/mach-at91/include/mach/at_hdmac.h

ATMEL ISI DRIVER
M:	Josh Wu <josh.wu@atmel.com>
L:	linux-media@vger.kernel.org
S:	Supported
F:	drivers/media/video/atmel-isi.c
F:	include/media/atmel-isi.h

ATMEL LCDFB DRIVER
M:	Nicolas Ferre <nicolas.ferre@atmel.com>
L:	linux-fbdev@vger.kernel.org
@@ -1348,10 +1363,22 @@ M: Nicolas Ferre <nicolas.ferre@atmel.com>
S:	Supported
F:	drivers/spi/spi-atmel.*

ATMEL Timer Counter (TC) AND CLOCKSOURCE DRIVERS
M:	Nicolas Ferre <nicolas.ferre@atmel.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 TSADCC DRIVER
M:	Josh Wu <josh.wu@atmel.com>
L:	linux-input@vger.kernel.org
S:	Supported
F:	drivers/input/touchscreen/atmel_tsadcc.c

ATMEL USBA UDC DRIVER
M:	Nicolas Ferre <nicolas.ferre@atmel.com>
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
W:	http://avr32linux.org/twiki/bin/view/Main/AtmelUsbDeviceDriver
S:	Supported
F:	drivers/usb/gadget/atmel_usba_udc.*