diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-21 13:44:22 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-21 13:44:22 +1000 |
commit | c9249a28c24345cf0c2c5a70253f103e793e312d (patch) | |
tree | f516754c7fcf57048168b093e98e65a244264585 /MAINTAINERS | |
parent | 63bf6b87afd1eb5e8d5a249d1a66b44e2d1fd295 (diff) | |
parent | 1d9e954e8b522ae37c7c0fdd791b5736321684a0 (diff) |
Merge remote-tracking branch 'wireless-next/master'
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8fdc5c2ef9e4..d2600fd39145 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -148,6 +148,13 @@ L: linux-scsi@vger.kernel.org S: Maintained 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 +S: Maintained +F: net/6lowpan/ + 6PACK NETWORK DRIVER FOR AX.25 M: Andreas Koensgen <ajk@comnets.uni-bremen.de> L: linux-hams@vger.kernel.org |