aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Ferre <nicolas.ferre@atmel.com>2015-04-29 05:57:18 -0400
committerArnd Bergmann <arnd@arndb.de>2015-05-07 12:29:51 -0400
commitd68b35f845cc56472fa0d782449ff1549f00ec47 (patch)
tree47ba6abb5a40b9cd1784b31152489034129c7a64
parent454be2af5b49612e7f20ceb6683d5809ce848bee (diff)
MAINTAINERS: replace an AT91 maintainer
As some help is needed from an active maintainer, replace Andrew Victor by Alexandre Belloni in the ARM/Atmel MAINTAINERS' entry (aka AT91). Add an entry to the CREDITS file. Thanks Andrew for the great role you played during the early days of this product family. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Andrew Victor <linux@maxim.org.za> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--CREDITS7
-rw-r--r--MAINTAINERS3
2 files changed, 8 insertions, 2 deletions
diff --git a/CREDITS b/CREDITS
index 40cc4bfb34db..ec7e6c7fdd1b 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3709,6 +3709,13 @@ N: Dirk Verworner
3709D: Co-author of German book ``Linux-Kernel-Programmierung'' 3709D: Co-author of German book ``Linux-Kernel-Programmierung''
3710D: Co-founder of Berlin Linux User Group 3710D: Co-founder of Berlin Linux User Group
3711 3711
3712N: Andrew Victor
3713E: linux@maxim.org.za
3714W: http://maxim.org.za/at91_26.html
3715D: First maintainer of Atmel ARM-based SoC, aka AT91
3716D: Introduced support for at91rm9200, the first chip of AT91 family
3717S: South Africa
3718
3712N: Riku Voipio 3719N: Riku Voipio
3713E: riku.voipio@iki.fi 3720E: riku.voipio@iki.fi
3714D: Author of PCA9532 LED and Fintek f75375s hwmon driver 3721D: Author of PCA9532 LED and Fintek f75375s hwmon driver
diff --git a/MAINTAINERS b/MAINTAINERS
index f639c04c8098..3ab4597c6a8b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -892,11 +892,10 @@ S: Maintained
892F: arch/arm/mach-alpine/ 892F: arch/arm/mach-alpine/
893 893
894ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES 894ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES
895M: Andrew Victor <linux@maxim.org.za>
896M: Nicolas Ferre <nicolas.ferre@atmel.com> 895M: Nicolas Ferre <nicolas.ferre@atmel.com>
896M: Alexandre Belloni <alexandre.belloni@free-electrons.com>
897M: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> 897M: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
898L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 898L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
899W: http://maxim.org.za/at91_26.html
900W: http://www.linux4sam.org 899W: http://www.linux4sam.org
901S: Supported 900S: Supported
902F: arch/arm/mach-at91/ 901F: arch/arm/mach-at91/