diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-14 17:48:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-14 17:48:14 -0700 |
| commit | 2ca7d674d7ab2220707b2ada0b690c0e7c95e7ac (patch) | |
| tree | 9c0927ed1d540e5fd704c1f82689870786514655 /MAINTAINERS | |
| parent | 2195d2818c37bdf263865f1e9effccdd9fc5f9d4 (diff) | |
| parent | 87d721ad7a37b7650dd710c88dd5c6a5bf9fe996 (diff) | |
| download | linux-2ca7d674d7ab2220707b2ada0b690c0e7c95e7ac.tar.gz | |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (257 commits)
[ARM] Update mach-types
ARM: 5636/1: Move vendor enum to AMBA include
ARM: Fix pfn_valid() for sparse memory
[ARM] orion5x: Add LaCie NAS 2Big Network support
[ARM] pxa/sharpsl_pm: zaurus c3000 aka spitz: fix resume
ARM: 5686/1: at91: Correct AC97 reset line in at91sam9263ek board
ARM: 5640/1: This patch modifies the support of AC97 on the at91sam9263 ek board
ARM: 5689/1: Update default config of HP Jornada 700-series machines
ARM: 5691/1: fix cache aliasing issues between kmap() and kmap_atomic() with highmem
ARM: 5688/1: ks8695_serial: disable_irq() lockup
ARM: 5687/1: fix an oops with highmem
ARM: 5684/1: Add nuc960 platform to w90x900
ARM: 5683/1: Add nuc950 platform to w90x900
ARM: 5682/1: Add cpu.c and dev.c and modify some files of w90p910 platform
ARM: 5626/1: add suspend/resume functions to amba-pl011 serial driver
ARM: 5625/1: fix hard coded 4K resource size in amba bus detection
MMC: MMCI: convert realview MMC to use gpiolib
ARM: 5685/1: Make MMCI driver compile without gpiolib
ARM: implement highpte
ARM: Show FIQ in /proc/interrupts on CONFIG_FIQ
...
Fix up trivial conflict in arch/arm/kernel/signal.c.
It was due to the TIF_NOTIFY_RESUME addition in commit d0420c83f ("KEYS:
Extend TIF_NOTIFY_RESUME to (almost) all architectures") and follow-ups.
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 15169365c339..256d72ad8437 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -534,10 +534,30 @@ L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) W: http://maxim.org.za/at91_26.html S: Maintained +ARM/BCMRING ARM ARCHITECTURE +M: Leo Chen <leochen@broadcom.com> +M: Scott Branden <sbranden@broadcom.com> +L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) +S: Maintained +F: arch/arm/mach-bcmring + +ARM/BCMRING MTD NAND DRIVER +M: Leo Chen <leochen@broadcom.com> +M: Scott Branden <sbranden@broadcom.com> +L: linux-mtd@lists.infradead.org +S: Maintained +F: drivers/mtd/nand/bcm_umi_nand.c +F: drivers/mtd/nand/bcm_umi_bch.c +F: drivers/mtd/nand/bcm_umi_hamming.c +F: drivers/mtd/nand/nand_bcm_umi.h + ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE -M: Lennert Buytenhek <kernel@wantstofly.org> +M: Hartley Sweeten <hsweeten@visionengravers.com> +M: Ryan Mallon <ryan@bluewatersys.com> L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) S: Maintained +F: arch/arm/mach-ep93xx/ +F: arch/arm/mach-ep93xx/include/mach/ ARM/CIRRUS LOGIC EDB9315A MACHINE SUPPORT M: Lennert Buytenhek <kernel@wantstofly.org> @@ -685,6 +705,18 @@ ARM/MAGICIAN MACHINE SUPPORT M: Philipp Zabel <philipp.zabel@gmail.com> S: Maintained +ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support +M: Lennert Buytenhek <buytenh@marvell.com> +M: Nicolas Pitre <nico@marvell.com> +L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) +T: git git://git.marvell.com/orion +S: Maintained +F: arch/arm/mach-loki/ +F: arch/arm/mach-kirkwood/ +F: arch/arm/mach-mv78xx0/ +F: arch/arm/mach-orion5x/ +F: arch/arm/plat-orion/ + ARM/MIOA701 MACHINE SUPPORT M: Robert Jarzmik <robert.jarzmik@free.fr> L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) |