diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-08-25 15:58:02 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-08-25 15:58:02 -0400 |
| commit | 07bc788424b9a2ee6cc20b70311c0950897ee0eb (patch) | |
| tree | 5fe22b7e776522987ed605fc1374ac2846b599ea /MAINTAINERS | |
| parent | 47e4df94d129cbca84de252ff63c4ded08a513e7 (diff) | |
| parent | 13cac15296afe7e42088ecfcd0f1d4b658248c46 (diff) | |
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* | |||
| 152 | 152 | ||
| 153 | 6LOWPAN GENERIC (BTLE/IEEE 802.15.4) | 153 | 6LOWPAN GENERIC (BTLE/IEEE 802.15.4) |
| 154 | M: Alexander Aring <alex.aring@gmail.com> | 154 | M: Alexander Aring <alex.aring@gmail.com> |
| 155 | L: linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers) | ||
| 156 | L: linux-bluetooth@vger.kernel.org | 155 | L: linux-bluetooth@vger.kernel.org |
| 156 | L: linux-wpan@vger.kernel.org | ||
| 157 | S: Maintained | 157 | S: Maintained |
| 158 | F: net/6lowpan/ | 158 | F: net/6lowpan/ |
| 159 | F: include/net/6lowpan.h | 159 | F: include/net/6lowpan.h |
| @@ -4580,13 +4580,14 @@ F: drivers/idle/i7300_idle.c | |||
| 4580 | 4580 | ||
| 4581 | IEEE 802.15.4 SUBSYSTEM | 4581 | IEEE 802.15.4 SUBSYSTEM |
| 4582 | M: Alexander Aring <alex.aring@gmail.com> | 4582 | M: Alexander Aring <alex.aring@gmail.com> |
| 4583 | L: linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers) | 4583 | L: linux-wpan@vger.kernel.org |
| 4584 | W: http://apps.sourceforge.net/trac/linux-zigbee | 4584 | W: https://github.com/linux-wpan |
| 4585 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git | 4585 | T: git git://github.com/linux-wpan/linux-wpan-next.git |
| 4586 | S: Maintained | 4586 | S: Maintained |
| 4587 | F: net/ieee802154/ | 4587 | F: net/ieee802154/ |
| 4588 | F: net/mac802154/ | 4588 | F: net/mac802154/ |
| 4589 | F: drivers/net/ieee802154/ | 4589 | F: drivers/net/ieee802154/ |
| 4590 | F: Documentation/networking/ieee802154.txt | ||
| 4590 | 4591 | ||
| 4591 | IGUANAWORKS USB IR TRANSCEIVER | 4592 | IGUANAWORKS USB IR TRANSCEIVER |
| 4592 | M: Sean Young <sean@mess.org> | 4593 | M: Sean Young <sean@mess.org> |