diff options
| author | David S. Miller <davem@davemloft.net> | 2015-06-23 03:17:47 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-23 03:17:47 -0700 |
| commit | bfdc8dbdf840f2a96d7b4cbb73fc22d973c84441 (patch) | |
| tree | 5dc9cb0cdcf8a1212f2efbebed3ab6781eab39db /MAINTAINERS | |
| parent | 4cd6b4754492c08f00e6237fd7e5c8b443370d15 (diff) | |
| parent | 952497b159468477392f9b562b904da9bc76d468 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2015-06-18
Here's the final bluetooth-next pull request for 4.2.
- Cleanups & fixes to 802.15.4 code and related drivers
- Fix btusb driver memory leak
- New USB IDs for Atheros controllers
- Support for BCM4324B3 UART based Broadcom controller
- Fix for Bluetooth encryption key size handling
- Broadcom controller initialization fixes
- Support for Intel controller DDC parameters
- Support for multiple Bluetooth LE advertising instances
- Fix for HCI user channel cleanup path
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 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2e122946692c..0dd87817c734 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1875,6 +1875,14 @@ W: http://www.attotech.com S: Supported F: drivers/scsi/esas2r +ATUSB IEEE 802.15.4 RADIO DRIVER +M: Stefan Schmidt <stefan@osg.samsung.com> +L: linux-wpan@vger.kernel.org +S: Maintained +F: drivers/net/ieee802154/atusb.c +F: drivers/net/ieee802154/atusb.h +F: drivers/net/ieee802154/at86rf230.h + AUDIT SUBSYSTEM M: Paul Moore <paul@paul-moore.com> M: Eric Paris <eparis@redhat.com> |