diff --git a/[refs] b/[refs]
index f684c39ca9ce..1c19aacc6cd8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf4ae4e3de83e2c7394af70b46f4f50e5f0fb90c
+refs/heads/master: 4371ee353c3fc41aad9458b8e8e627eb508bc9a3
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 2b349ba4add4..111fc169437a 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -1532,6 +1532,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