diff --git a/[refs] b/[refs] index 69425da80439..be413c7a2964 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5daa2963f8bd51c161d5b244e439e0c9fdec358b +refs/heads/master: eb51b0349df8efccc37fc06aa25aecbd4d39551b diff --git a/trunk/CREDITS b/trunk/CREDITS index e76d300e9fe4..44c13d19e7ea 100644 --- a/trunk/CREDITS +++ b/trunk/CREDITS @@ -2006,6 +2006,9 @@ E: paul@laufernet.com D: Soundblaster driver fixes, ISAPnP quirk S: California, USA +N: Jonathan Layes +D: ARPD support + N: Tom Lees E: tom@lpsg.demon.co.uk W: http://www.lpsg.demon.co.uk/ diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 7d10f06d0889..b42f1b11fa09 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -951,12 +951,6 @@ W: http://www.arm.linux.org.uk/ S: Maintained F: arch/arm/vfp/ -ARPD SUPPORT -P: Jonathan Layes -L: netdev@vger.kernel.org -S: Maintained -F: net/ipv4/arp.c - ASUS ACPI EXTRAS DRIVER P: Corentin Chary M: corentincj@iksaif.net