X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=MAINTAINERS;h=e9457feb7eba6f9f138815977c165b6749e93461;hb=e86435eb91b2bff114c5a02e46e16ce21b647ebe;hp=873ca1fce020ba28d370d456683e544a87a04c38;hpb=228b60acaa4529c2208ee7a420f6a12b464ce285;p=safe%2Fjmp%2Flinux-2.6

diff --git a/MAINTAINERS b/MAINTAINERS
index 873ca1f..e9457fe 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -222,6 +222,13 @@ L:	linux-acenic@sunsite.dk
 S:	Maintained
 F:	drivers/net/acenic*
 
+ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER
+P: Peter Feuerer
+M: peter@piie.net
+W: http://piie.net/?section=acerhdf
+S: Maintained
+F: drivers/platform/x86/acerhdf.c
+
 ACER WMI LAPTOP EXTRAS
 P:	Carlos Corbacho
 M:	carlos@strangeworlds.co.uk
@@ -1542,6 +1549,13 @@ W:	http://www.fi.muni.cz/~kas/cosa/
 S:	Maintained
 F:	drivers/net/wan/cosa*
 
+CPMAC ETHERNET DRIVER
+P:	Florian Fainelli
+M:	florian@openwrt.org
+L:	netdev@vger.kernel.org
+S:	Maintained
+F:	drivers/net/cpmac.c
+
 CPU FREQUENCY DRIVERS
 P:	Dave Jones
 M:	davej@redhat.com