diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 18:31:07 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 18:31:07 -0500 |
| commit | 64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39 (patch) | |
| tree | a434977a6caa9b41cc0daaf71dbd76ac8693aba6 /MAINTAINERS | |
| parent | b93a4afcff7be859e30cad2a305731516057d6cf (diff) | |
| parent | 17ccb834d517c66c09123c24ba8553c5b14e0f78 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c16cce63b8ae..776a5a46e351 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -941,6 +941,16 @@ W: http://www.fluff.org/ben/linux/ | |||
| 941 | S: Maintained | 941 | S: Maintained |
| 942 | F: arch/arm/mach-s3c6410/ | 942 | F: arch/arm/mach-s3c6410/ |
| 943 | 943 | ||
| 944 | ARM/SHMOBILE ARM ARCHITECTURE | ||
| 945 | M: Paul Mundt <lethal@linux-sh.org> | ||
| 946 | M: Magnus Damm <magnus.damm@gmail.com> | ||
| 947 | L: linux-sh@vger.kernel.org | ||
| 948 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git | ||
| 949 | W: http://oss.renesas.com | ||
| 950 | S: Supported | ||
| 951 | F: arch/arm/mach-shmobile/ | ||
| 952 | F: drivers/sh/ | ||
| 953 | |||
| 944 | ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT | 954 | ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT |
| 945 | M: Lennert Buytenhek <kernel@wantstofly.org> | 955 | M: Lennert Buytenhek <kernel@wantstofly.org> |
| 946 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 956 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |