diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-22 11:23:56 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-22 11:23:56 +1000 |
| commit | f28352a43ec6915841a0d3d1968c7029ba038989 (patch) | |
| tree | bb2a32c8c724a244b44147e69e7d6dadc5179f65 /MAINTAINERS | |
| parent | 3a76a14d7a78e2f80fa0ade3679b4379c12065c8 (diff) | |
| parent | 5bd425aa2b9c3e11e6a01c623ef70b39cb029ca1 (diff) | |
Merge remote-tracking branch 'bluetooth/master'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 43d0f6d9976a..02eec585697a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -155,7 +155,7 @@ S: Maintained F: drivers/scsi/53c700* 6LOWPAN GENERIC (BTLE/IEEE 802.15.4) -M: Alexander Aring <aar@pengutronix.de> +M: Alexander Aring <alex.aring@gmail.com> M: Jukka Rissanen <jukka.rissanen@linux.intel.com> L: linux-bluetooth@vger.kernel.org L: linux-wpan@vger.kernel.org @@ -6424,7 +6424,7 @@ F: Documentation/cdrom/ide-cd F: drivers/ide/ide-cd* IEEE 802.15.4 SUBSYSTEM -M: Alexander Aring <aar@pengutronix.de> +M: Alexander Aring <alex.aring@gmail.com> M: Stefan Schmidt <stefan@osg.samsung.com> L: linux-wpan@vger.kernel.org W: http://wpan.cakelab.org/ |