diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-19 21:12:24 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-19 21:13:41 -0800 |
| commit | 844e8a16f25568eefd02a6bfb40bdd9bc04704b8 (patch) | |
| tree | fdfe4de420c66517a2e4a2a25a454997c6210e95 /MAINTAINERS | |
| parent | 5ecdd39f6cdd57aa42e072bf30aa7239fd109d7a (diff) | |
| parent | a53bfa07369b7c3448a60d29f0fc2e81751ed0b7 (diff) | |
Merge branch 'picoxcell/cleanup' into next/cleanup
* picoxcell/cleanup: (4 commits)
MAINTAINERS: add maintainer entry for Picochip picoxcell
ARM: picoxcell: move io mappings to common.c
ARM: picoxcell: don't reserve irq_descs
ARM: picoxcell: remove mach/memory.h
Conflicts:
arch/arm/mach-at91/setup.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b9db108f01c..796d67a5849 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5117,6 +5117,15 @@ L: linux-mtd@lists.infradead.org S: Maintained F: drivers/mtd/devices/phram.c +PICOXCELL SUPPORT +M: Jamie Iles <jamie@jamieiles.com> +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +T: git git://github.com/jamieiles/linux-2.6-ji.git +S: Supported +F: arch/arm/mach-picoxcell +F: drivers/*/picoxcell* +F: drivers/*/*/picoxcell* + PIN CONTROL SUBSYSTEM M: Linus Walleij <linus.walleij@linaro.org> S: Maintained |