diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-08-25 23:58:02 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-08-25 23:58:02 +0400 |
| commit | 07bc788424b9a2ee6cc20b70311c0950897ee0eb (patch) | |
| tree | 5fe22b7e776522987ed605fc1374ac2846b599ea /MAINTAINERS | |
| parent | 47e4df94d129cbca84de252ff63c4ded08a513e7 (diff) | |
| parent | 13cac15296afe7e42088ecfcd0f1d4b658248c46 (diff) | |
| download | linux-07bc788424b9a2ee6cc20b70311c0950897ee0eb.tar.xz | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f01f54f27750..b0a9003a1334 100644 --- 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> |