diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 14:50:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 14:50:01 -0800 |
| commit | 07a6d5a49c985ae6111221b93b3a48772cc4b976 (patch) | |
| tree | ab55ca70c64aa8d9d9c8c003092ae9d95d2bfc57 /MAINTAINERS | |
| parent | b4297b01198bc2501038bb463b6631f6f3782cc0 (diff) | |
| parent | 3fcca9ac6cbce35b3e81e247d375534117d5f4cd (diff) | |
| download | linux-07a6d5a49c985ae6111221b93b3a48772cc4b976.tar.bz2 | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] Update mach-types
ARM: 5793/1: ARM: Check put_user fail in do_signal when enable OABI_COMPAT
MAINTAINERS: add maintainer information for AMBA primecell drivers
[ARM] pxa/spitz: fix compile regression on spitz
ARM: PNX4008: i2c-pnx: use the same dev_id for request_irq and free_irq
[ARM] pxa/cpufreq: fix index assignments for end marker
ARM: PNX4008: fix watchdog device driver name
[ARM] kmap: fix build errors with DEBUG_HIGHMEM enabled
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 23d09d78a7b9..c385456caaf0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -512,10 +512,32 @@ W: http://www.arm.linux.org.uk/ S: Maintained F: arch/arm/ +ARM PRIMECELL AACI PL041 DRIVER +M: Russell King <linux@arm.linux.org.uk> +S: Maintained +F: sound/arm/aaci.* + +ARM PRIMECELL CLCD PL110 DRIVER +M: Russell King <linux@arm.linux.org.uk> +S: Maintained +F: drivers/video/amba-clcd.* + +ARM PRIMECELL KMI PL050 DRIVER +M: Russell King <linux@arm.linux.org.uk> +S: Maintained +F: drivers/input/serio/ambakmi.* +F: include/linux/amba/kmi.h + ARM PRIMECELL MMCI PL180/1 DRIVER S: Orphan F: drivers/mmc/host/mmci.* +ARM PRIMECELL BUS SUPPORT +M: Russell King <linux@arm.linux.org.uk> +S: Maintained +F: drivers/amba/ +F: include/linux/amba/bus.h + ARM/ADI ROADRUNNER MACHINE SUPPORT M: Lennert Buytenhek <kernel@wantstofly.org> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |