diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2011-01-20 14:44:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-20 17:02:06 -0800 |
| commit | c1fc8675c9e3dede8e7cd91cebb2025e2e6db2dc (patch) | |
| tree | 78d5a6faee70834cc969e64a205636a4b0134f3a /MAINTAINERS | |
| parent | 382e27daa542ce97c500dc357841c6416c735cc2 (diff) | |
| download | blackbird-op-linux-c1fc8675c9e3dede8e7cd91cebb2025e2e6db2dc.tar.gz blackbird-op-linux-c1fc8675c9e3dede8e7cd91cebb2025e2e6db2dc.zip | |
MAINTAINERS: update Atmel AT91 entry
Add two co-maintainers and update the entry with new information.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Andrew Victor <linux@maxim.org.za>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1af022e63668..09ea4de09e79 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -624,11 +624,15 @@ M: Lennert Buytenhek <kernel@wantstofly.org> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained -ARM/ATMEL AT91RM9200 ARM ARCHITECTURE +ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES M: Andrew Victor <linux@maxim.org.za> +M: Nicolas Ferre <nicolas.ferre@atmel.com> +M: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) W: http://maxim.org.za/at91_26.html -S: Maintained +W: http://www.linux4sam.org +S: Supported +F: arch/arm/mach-at91/ ARM/BCMRING ARM ARCHITECTURE M: Jiandong Zheng <jdzheng@broadcom.com> |
