diff options
| author | David S. Miller <davem@davemloft.net> | 2017-05-25 18:54:49 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-25 18:54:49 +0200 |
| commit | 52c05fc744215b3969c9b522d2ff5a82fd3d64ed (patch) | |
| tree | d8e77a27950d5d15e3ddb6295dd1be00e0bdb15f /MAINTAINERS | |
| parent | net: phy: put genphy_config_init's EXPORT_SYMBOL directly after the function (diff) | |
| parent | net: ieee802154: fix potential null pointer dereference (diff) | |
| download | linux-52c05fc744215b3969c9b522d2ff5a82fd3d64ed.tar.xz linux-52c05fc744215b3969c9b522d2ff5a82fd3d64ed.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2017-05-23
Here's the first Bluetooth & 802.15.4 pull request targeting the 4.13
kernel release.
- Bluetooth 5.0 improvements (Data Length Extensions and alternate PHY)
- Support for new Intel Bluetooth adapter [[8087:0aaa]
- Various fixes to ieee802154 code
- Various fixes to HCI UART code
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ea074d92cc2c..553dbbddf3e4 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 @@ -6427,7 +6427,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/ |