Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...

[cascardo/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index f01f54f..b0a9003 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -152,8 +152,8 @@ F:  drivers/scsi/53c700*
 
 6LOWPAN GENERIC (BTLE/IEEE 802.15.4)
 M:     Alexander Aring <alex.aring@gmail.com>
-L:     linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers)
 L:     linux-bluetooth@vger.kernel.org
+L:     linux-wpan@vger.kernel.org
 S:     Maintained
 F:     net/6lowpan/
 F:     include/net/6lowpan.h
@@ -4580,13 +4580,14 @@ F:      drivers/idle/i7300_idle.c
 
 IEEE 802.15.4 SUBSYSTEM
 M:     Alexander Aring <alex.aring@gmail.com>
-L:     linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers)
-W:     http://apps.sourceforge.net/trac/linux-zigbee
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git
+L:     linux-wpan@vger.kernel.org
+W:     https://github.com/linux-wpan
+T:     git git://github.com/linux-wpan/linux-wpan-next.git
 S:     Maintained
 F:     net/ieee802154/
 F:     net/mac802154/
 F:     drivers/net/ieee802154/
+F:     Documentation/networking/ieee802154.txt
 
 IGUANAWORKS USB IR TRANSCEIVER
 M:     Sean Young <sean@mess.org>