diff options
| -rw-r--r-- | CREDITS | 7 | ||||
| -rw-r--r-- | MAINTAINERS | 3 |
2 files changed, 8 insertions, 2 deletions
| @@ -3709,6 +3709,13 @@ N: Dirk Verworner | |||
| 3709 | D: Co-author of German book ``Linux-Kernel-Programmierung'' | 3709 | D: Co-author of German book ``Linux-Kernel-Programmierung'' |
| 3710 | D: Co-founder of Berlin Linux User Group | 3710 | D: Co-founder of Berlin Linux User Group |
| 3711 | 3711 | ||
| 3712 | N: Andrew Victor | ||
| 3713 | E: linux@maxim.org.za | ||
| 3714 | W: http://maxim.org.za/at91_26.html | ||
| 3715 | D: First maintainer of Atmel ARM-based SoC, aka AT91 | ||
| 3716 | D: Introduced support for at91rm9200, the first chip of AT91 family | ||
| 3717 | S: South Africa | ||
| 3718 | |||
| 3712 | N: Riku Voipio | 3719 | N: Riku Voipio |
| 3713 | E: riku.voipio@iki.fi | 3720 | E: riku.voipio@iki.fi |
| 3714 | D: Author of PCA9532 LED and Fintek f75375s hwmon driver | 3721 | D: 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 | |||
| 892 | F: arch/arm/mach-alpine/ | 892 | F: arch/arm/mach-alpine/ |
| 893 | 893 | ||
| 894 | ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES | 894 | ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES |
| 895 | M: Andrew Victor <linux@maxim.org.za> | ||
| 896 | M: Nicolas Ferre <nicolas.ferre@atmel.com> | 895 | M: Nicolas Ferre <nicolas.ferre@atmel.com> |
| 896 | M: Alexandre Belloni <alexandre.belloni@free-electrons.com> | ||
| 897 | M: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> | 897 | M: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> |
| 898 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 898 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
| 899 | W: http://maxim.org.za/at91_26.html | ||
| 900 | W: http://www.linux4sam.org | 899 | W: http://www.linux4sam.org |
| 901 | S: Supported | 900 | S: Supported |
| 902 | F: arch/arm/mach-at91/ | 901 | F: arch/arm/mach-at91/ |
