diff options
author | David S. Miller <davem@davemloft.net> | 2016-03-14 15:44:56 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-03-14 15:44:56 -0400 |
commit | 180a2c542ce904e256ba0d8732517d7f42b3f3fa (patch) | |
tree | ca2f16af1ef73587ffd9bd0b116aeaa24c21125e /drivers/net/wireless/intel/iwlwifi/iwl-csr.h | |
parent | f7f58ae0f81bf454030eb76444646d15b0bfba2c (diff) | |
parent | 6a0e78072c2ae7b20b14e0249d8108441ea928d2 (diff) | |
download | blackbird-obmc-linux-180a2c542ce904e256ba0d8732517d7f42b3f3fa.tar.gz blackbird-obmc-linux-180a2c542ce904e256ba0d8732517d7f42b3f3fa.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-12
Here's the last bluetooth-next pull request for the 4.6 kernel.
- New USB ID for AR3012 in btusb
- New BCM2E55 ACPI ID
- Buffer overflow fix for the Add Advertising command
- Support for a new Bluetooth LE limited privacy mode
- Fix for firmware activation in btmrvl_sdio
- Cleanups to mac802154 & 6lowpan code
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-csr.h')
0 files changed, 0 insertions, 0 deletions