diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 19:00:54 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 19:00:54 -0500 |
commit | dca1d9f6d7ae428c193f32bd3e9a4ca13176648b (patch) | |
tree | 02de8c3503c1c811754423d2fa3f3b4978044f6e /MAINTAINERS | |
parent | 9ff99339447de403a46be5e3f23d0c794d540b06 (diff) | |
parent | 91e013827c0bcbb187ecf02213c5446b6f62d445 (diff) |
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: (370 commits)
ARM: S3C2443: Add set_rate and round_rate calls for armdiv clock
ARM: S3C2443: Remove #if 0 for clk_mpll
ARM: S3C2443: Update notes on MPLLREF clock
ARM: S3C2443: Further clksrc-clk conversions
ARM: S3C2443: Change to using plat-samsung clksrc-clk implementation
USB: Fix s3c-hsotg build following Samsung platform header moves
ARM: S3C64XX: Reintroduce unconditional build of audio device
ARM: 5961/1: ux500: fix CLKRST addresses
ARM: 5977/1: arm: Enable backtrace printing on oops when PC is corrupted
ASoC: Fix S3C64xx IIS driver for Samsung header reorg
ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support
[ARM] pxa: fix typo in mxm8x10.h
[ARM] pxa/raumfeld: set GPIO drive bits for LED pins
[ARM] pxa/zeus: Add support for mcp2515 CAN bus
[ARM] pxa/zeus: Add support for onboard max6369 watchdog
[ARM] pxa/zeus: Add Eurotech as the manufacturer
[ARM] pxa/zeus: Correct the USB host initialisation flags
[ARM] pxa/zeus: Allow usage of 8250-compatible UART in uncompress
[ARM] pxa: refactor uncompress.h for non-PXA uarts
[ARM] mmp2: fix incorrect calling of chip->mask_ack() for 2nd level cascaded IRQs
...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b2403eb495bc..fe88b5f732cd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -666,6 +666,12 @@ T: git://git.pengutronix.de/git/imx/linux-2.6.git | |||
666 | F: arch/arm/mach-mx*/ | 666 | F: arch/arm/mach-mx*/ |
667 | F: arch/arm/plat-mxc/ | 667 | F: arch/arm/plat-mxc/ |
668 | 668 | ||
669 | ARM/FREESCALE IMX51 | ||
670 | M: Amit Kucheria <amit.kucheria@canonical.com> | ||
671 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | ||
672 | S: Maintained | ||
673 | F: arch/arm/mach-mx5/ | ||
674 | |||
669 | ARM/GLOMATION GESBC9312SX MACHINE SUPPORT | 675 | ARM/GLOMATION GESBC9312SX MACHINE SUPPORT |
670 | M: Lennert Buytenhek <kernel@wantstofly.org> | 676 | M: Lennert Buytenhek <kernel@wantstofly.org> |
671 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 677 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
@@ -939,6 +945,16 @@ W: http://www.fluff.org/ben/linux/ | |||
939 | S: Maintained | 945 | S: Maintained |
940 | F: arch/arm/mach-s3c6410/ | 946 | F: arch/arm/mach-s3c6410/ |
941 | 947 | ||
948 | ARM/SHMOBILE ARM ARCHITECTURE | ||
949 | M: Paul Mundt <lethal@linux-sh.org> | ||
950 | M: Magnus Damm <magnus.damm@gmail.com> | ||
951 | L: linux-sh@vger.kernel.org | ||
952 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git | ||
953 | W: http://oss.renesas.com | ||
954 | S: Supported | ||
955 | F: arch/arm/mach-shmobile/ | ||
956 | F: drivers/sh/ | ||
957 | |||
942 | ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT | 958 | ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT |
943 | M: Lennert Buytenhek <kernel@wantstofly.org> | 959 | M: Lennert Buytenhek <kernel@wantstofly.org> |
944 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 960 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
@@ -4502,6 +4518,13 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | |||
4502 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git | 4518 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git |
4503 | S: Maintained | 4519 | S: Maintained |
4504 | 4520 | ||
4521 | MMP2 SUPPORT (aka ARMADA610) | ||
4522 | M: Haojian Zhuang <haojian.zhuang@marvell.com> | ||
4523 | M: Eric Miao <eric.y.miao@gmail.com> | ||
4524 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | ||
4525 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git | ||
4526 | S: Maintained | ||
4527 | |||
4505 | PXA MMCI DRIVER | 4528 | PXA MMCI DRIVER |
4506 | S: Orphan | 4529 | S: Orphan |
4507 | 4530 | ||