wil6210: p2p initial support

[mirror_ubuntu-bionic-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 9c4d157f3ddbdacf60b9542dfe87632b6164160c..be0b56b38720617c0d86a4c6732ceae84b3ee327 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -151,7 +151,7 @@ S:  Maintained
 F:     drivers/scsi/53c700*
 
 6LOWPAN GENERIC (BTLE/IEEE 802.15.4)
-M:     Alexander Aring <alex.aring@gmail.com>
+M:     Alexander Aring <aar@pengutronix.de>
 M:     Jukka Rissanen <jukka.rissanen@linux.intel.com>
 L:     linux-bluetooth@vger.kernel.org
 L:     linux-wpan@vger.kernel.org
@@ -5424,10 +5424,11 @@ S:      Supported
 F:     drivers/idle/i7300_idle.c
 
 IEEE 802.15.4 SUBSYSTEM
-M:     Alexander Aring <alex.aring@gmail.com>
+M:     Alexander Aring <aar@pengutronix.de>
 L:     linux-wpan@vger.kernel.org
-W:     https://github.com/linux-wpan
-T:     git git://github.com/linux-wpan/linux-wpan-next.git
+W:     http://wpan.cakelab.org/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
 S:     Maintained
 F:     net/ieee802154/
 F:     net/mac802154/
@@ -7500,7 +7501,6 @@ F:        net/netrom/
 
 NETRONOME ETHERNET DRIVERS
 M:     Jakub Kicinski <jakub.kicinski@netronome.com>
-M:     Rolf Neugebauer <rolf.neugebauer@netronome.com>
 L:     oss-drivers@netronome.com
 S:     Maintained
 F:     drivers/net/ethernet/netronome/