aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CREDITS3
-rw-r--r--MAINTAINERS6
2 files changed, 3 insertions, 6 deletions
diff --git a/CREDITS b/CREDITS
index e76d300e9fe4..44c13d19e7ea 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2006,6 +2006,9 @@ E: paul@laufernet.com
2006D: Soundblaster driver fixes, ISAPnP quirk 2006D: Soundblaster driver fixes, ISAPnP quirk
2007S: California, USA 2007S: California, USA
2008 2008
2009N: Jonathan Layes
2010D: ARPD support
2011
2009N: Tom Lees 2012N: Tom Lees
2010E: tom@lpsg.demon.co.uk 2013E: tom@lpsg.demon.co.uk
2011W: http://www.lpsg.demon.co.uk/ 2014W: http://www.lpsg.demon.co.uk/
diff --git a/MAINTAINERS b/MAINTAINERS
index 7d10f06d0889..b42f1b11fa09 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -951,12 +951,6 @@ W: http://www.arm.linux.org.uk/
951S: Maintained 951S: Maintained
952F: arch/arm/vfp/ 952F: arch/arm/vfp/
953 953
954ARPD SUPPORT
955P: Jonathan Layes
956L: netdev@vger.kernel.org
957S: Maintained
958F: net/ipv4/arp.c
959
960ASUS ACPI EXTRAS DRIVER 954ASUS ACPI EXTRAS DRIVER
961P: Corentin Chary 955P: Corentin Chary
962M: corentincj@iksaif.net 956M: corentincj@iksaif.net