1 files changed, 22 insertions, 3 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 77f277e1b4b9..a6df68fad9ba 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1545,6 +1545,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
@@ -2812,6 +2819,18 @@ L:	linux1394-devel@lists.sourceforge.net
 S:      Maintained
 F:      drivers/ieee1394/raw1394*
 
+IEEE 802.15.4 SUBSYSTEM
+P:      Dmitry Eremin-Solenikov
+M:      dbaryshkov@gmail.com
+P:      Sergey Lapin
+M:      slapin@ossfans.org
+L:      linux-zigbee-devel@lists.sourceforge.net
+W:      http://apps.sourceforge.net/trac/linux-zigbee
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/lumag/lowpan.git
+S:      Maintained
+F:      net/ieee802154/
+F:      drivers/ieee801254/
+
 INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
 P:      Mimi Zohar
 M:      zohar@us.ibm.com
@@ -4746,9 +4765,9 @@ S:	Supported
 F:      fs/reiserfs/
 
 RFKILL
-P:      Ivo van Doorn
-M:      IvDoorn@gmail.com
-L:      netdev@vger.kernel.org
+P:      Johannes Berg
+M:      johannes@sipsolutions.net
+L:      linux-wireless@vger.kernel.org
 S:      Maintained
 F       Documentation/rfkill.txt
 F:      net/rfkill/