Commit 32b908ee authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'maintainers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull arm-soc updates for MAINTAINERS file from Olof Johansson:
 "This is a collection of updates to the MAINTAINERS file, separated out
  mostly to give an overview of what has changed regarding who does what.

  In particular, at91, orion and prima2 platforms and drivers are
  updated in this batch."

* tag 'maintainers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  MAINTAINER: add some drivers upstreamed in CSR SIRFPRIMA2
  maintainership update for the Marvell Orion family of SOCs
  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
parents 25f3cdf8 47ac3e44
...@@ -746,7 +746,10 @@ M: Barry Song <baohua.song@csr.com> ...@@ -746,7 +746,10 @@ M: Barry Song <baohua.song@csr.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained S: Maintained
F: arch/arm/mach-prima2/ F: arch/arm/mach-prima2/
F: drivers/dma/sirf-dma* F: drivers/dma/sirf-dma.c
F: drivers/i2c/busses/i2c-sirf.c
F: drivers/pinctrl/pinctrl-sirf.c
F: drivers/spi/spi-sirf.c
ARM/EBSA110 MACHINE SUPPORT ARM/EBSA110 MACHINE SUPPORT
M: Russell King <linux@arm.linux.org.uk> M: Russell King <linux@arm.linux.org.uk>
...@@ -908,11 +911,12 @@ ARM/MAGICIAN MACHINE SUPPORT ...@@ -908,11 +911,12 @@ ARM/MAGICIAN MACHINE SUPPORT
M: Philipp Zabel <philipp.zabel@gmail.com> M: Philipp Zabel <philipp.zabel@gmail.com>
S: Maintained S: Maintained
ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support
M: Lennert Buytenhek <kernel@wantstofly.org> M: Jason Cooper <jason@lakedaemon.net>
M: Nicolas Pitre <nico@fluxnic.net> M: Andrew Lunn <andrew@lunn.ch>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Odd Fixes S: Maintained
F: arch/arm/mach-dove/
F: arch/arm/mach-kirkwood/ F: arch/arm/mach-kirkwood/
F: arch/arm/mach-mv78xx0/ F: arch/arm/mach-mv78xx0/
F: arch/arm/mach-orion5x/ F: arch/arm/mach-orion5x/
...@@ -1331,6 +1335,21 @@ M: Nicolas Ferre <nicolas.ferre@atmel.com> ...@@ -1331,6 +1335,21 @@ M: Nicolas Ferre <nicolas.ferre@atmel.com>
S: Supported S: Supported
F: drivers/tty/serial/atmel_serial.c 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 ATMEL LCDFB DRIVER
M: Nicolas Ferre <nicolas.ferre@atmel.com> M: Nicolas Ferre <nicolas.ferre@atmel.com>
L: linux-fbdev@vger.kernel.org L: linux-fbdev@vger.kernel.org
...@@ -1348,10 +1367,22 @@ M: Nicolas Ferre <nicolas.ferre@atmel.com> ...@@ -1348,10 +1367,22 @@ M: Nicolas Ferre <nicolas.ferre@atmel.com>
S: Supported S: Supported
F: drivers/spi/spi-atmel.* 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 ATMEL USBA UDC DRIVER
M: Nicolas Ferre <nicolas.ferre@atmel.com> M: Nicolas Ferre <nicolas.ferre@atmel.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
W: http://avr32linux.org/twiki/bin/view/Main/AtmelUsbDeviceDriver
S: Supported S: Supported
F: drivers/usb/gadget/atmel_usba_udc.* F: drivers/usb/gadget/atmel_usba_udc.*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment