diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 13:13:19 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 13:13:19 -0400 |
| commit | 500b9fc922cbec572f4fd1436533bfaed5011262 (patch) | |
| tree | aac4b7de0871e66740aeaf3510f7a59280026592 /MAINTAINERS | |
| parent | f165eb77f49cb6f6e86e2f2f09183904b2965d19 (diff) | |
| parent | beccb12f6fbcc73339f127ff1f00638f076c933f (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
Conflicts:
drivers/net/irda/sh_irda.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5fb38d3f1423..0c0d829176a2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -955,8 +955,9 @@ ARM/SHMOBILE ARM ARCHITECTURE | |||
| 955 | M: Paul Mundt <lethal@linux-sh.org> | 955 | M: Paul Mundt <lethal@linux-sh.org> |
| 956 | M: Magnus Damm <magnus.damm@gmail.com> | 956 | M: Magnus Damm <magnus.damm@gmail.com> |
| 957 | L: linux-sh@vger.kernel.org | 957 | L: linux-sh@vger.kernel.org |
| 958 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git | ||
| 959 | W: http://oss.renesas.com | 958 | W: http://oss.renesas.com |
| 959 | Q: http://patchwork.kernel.org/project/linux-sh/list/ | ||
| 960 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git | ||
| 960 | S: Supported | 961 | S: Supported |
| 961 | F: arch/arm/mach-shmobile/ | 962 | F: arch/arm/mach-shmobile/ |
| 962 | F: drivers/sh/ | 963 | F: drivers/sh/ |