diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:52:55 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:52:55 +0200 |
| commit | 306df04e330bfa0f96bc49fc16db32084fa960f5 (patch) | |
| tree | d312d0a0852f8c5c47084b3c4e1e74c99812ffd0 /MAINTAINERS | |
| parent | 7fbabb52554c6916ce02599f73915576b9329559 (diff) | |
| parent | 6c59c115b0f295434cc4f917d180fecd84d39f81 (diff) | |
Merge branch 'next/soc' into for-next
Conflicts:
arch/arm/mach-omap2/cm-regbits-44xx.h
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 187282da921..6689b7c8266 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -731,6 +731,12 @@ T: git git://git.berlios.de/gemini-board S: Maintained F: arch/arm/mach-gemini/ +ARM/CSR SIRFPRIMA2 MACHINE SUPPORT +M: Barry Song <baohua.song@csr.com> +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +S: Maintained +F: arch/arm/mach-prima2/ + ARM/EBSA110 MACHINE SUPPORT M: Russell King <linux@arm.linux.org.uk> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |