diff options
| author | David S. Miller <davem@davemloft.net> | 2016-03-03 22:27:23 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-03 22:27:23 +0100 |
| commit | aefd3fb26ed28ee21ad658b3f326cd090c111eb3 (patch) | |
| tree | a1f8477105a1cbaea4b1c32e250c7140c9ec8973 /MAINTAINERS | |
| parent | net: relax setup_tc ndo op handle restriction (diff) | |
| parent | Bluetooth: hci_uart: Add diag and address support for Intel/AG6xx (diff) | |
| download | linux-aefd3fb26ed28ee21ad658b3f326cd090c111eb3.tar.xz linux-aefd3fb26ed28ee21ad658b3f326cd090c111eb3.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 2016-03-01
Here's our main set of Bluetooth & 802.15.4 patches for the 4.6 kernel.
- New Bluetooth HCI driver for Intel/AG6xx controllers
- New Broadcom ACPI IDs
- LED trigger support for indicating Bluetooth powered state
- Various fixes in mac802154, 6lowpan and related drivers
- New USB IDs for AR3012 Bluetooth controllers
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9c4d157f3ddb..f5d772686ddf 100644 --- 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/ |