Hi John, This is the first batch of patches intended for 3.14. There is nothing big here. Most of the code are refactors, clean up, small fixes, plus some new device id support. Please pull or let me know of any problems! Thanks. Gustavo --- The following changes since commit 4b074b07625f603d40d4d04937f8874a00415dc4: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next (2013-12-02 14:25:38 -0500) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git for-upstream for you to fetch changes up to 201a5929c8c788f9ef53b010065c9ce70c9c06f0: Bluetooth: Remove dead code from SMP encryption function (2013-12-04 11:09:05 -0200) ---------------------------------------------------------------- Andre Guedes (5): Bluetooth: Check address in mgmt_disconnect_failed() Bluetooth: Add an extra check in mgmt_device_disconnected() Bluetooth: Remove link type check in hci_disconn_complete_evt() Bluetooth: Remove unneeded check in hci_disconn_complete_evt() Bluetooth: Refactor hci_disconn_complete_evt Bing Zhao (3): Bluetooth: btmrvl: operate on 16-bit opcodes instead of ogf/ocf Bluetooth: btmrvl: use cal-data from device-tree instead of conf file Bluetooth: btmrvl: remove cal-data byte swapping and redundant mem copy Johan Hedberg (3): Bluetooth: Remove unnecessary 'send' parameter from smp_failure() Bluetooth: Remove useless smp_rand function Bluetooth: Remove dead code from SMP encryption function Marcel Holtmann (4): Bluetooth: Fix limited discoverable mode for Zeevo modules Bluetooth: Set default own address type only during controller setup Bluetooth: Remove debug statement for features complete event Bluetooth: Store supported commands only during setup procedure Sujith Manoharan (2): Bluetooth: ath3k: Add support for another AR3012 card Bluetooth: ath3k: Add support for a new AR3012 device Tedd Ho-Jeong An (2): Bluetooth: Add support for Intel Bluetooth device [8087:0a2a] Bluetooth: Enable autosuspend for Intel Bluetooth device drivers/bluetooth/ath3k.c | 4 ++ drivers/bluetooth/btmrvl_drv.h | 25 +++++----- drivers/bluetooth/btmrvl_main.c | 130 ++++++++++++--------------------------------------- drivers/bluetooth/btmrvl_sdio.c | 9 +--- drivers/bluetooth/btmrvl_sdio.h | 2 - drivers/bluetooth/btusb.c | 7 ++- net/bluetooth/hci_core.c | 20 ++++---- net/bluetooth/hci_event.c | 72 +++++++++++++--------------- net/bluetooth/mgmt.c | 17 ++++++- net/bluetooth/smp.c | 40 +++++----------- 10 files changed, 124 insertions(+), 202 deletions(-)
Attachment:
pgpfIG5dpAthj.pgp
Description: PGP signature