Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
[pandora-kernel.git] / MAINTAINERS
index e18baa4..a6df68f 100644 (file)
@@ -2819,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
@@ -4753,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/