pull request: bluetooth 2014-04-25

From: Gustavo Padovan
Date: Fri Apr 25 2014 - 08:46:22 EST


Hi John,

Some fixes for 3.15. There is a revert for the intel driver, a new device id,
and two important SSP fixes from Johan. This one is rebased on wireless/master.

Please pull or let me know of any concerns you have. Thanks!

Gustavo

---
The following changes since commit ffa216bb5eecfce0f01b0b2a95d5c320dde90005:

brcmfmac: Fix brcmf_chip_ai_coredisable not applying reset bits to BCMA_IOCTL (2014-04-24 21:46:22 -0400)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git for-upstream

for you to fetch changes up to 1fb4e09a7e780b915dbd172592ae7e2a4c071065:

Bluetooth: Add support for Lite-on [04ca:3007] (2014-04-25 09:47:16 +0300)

----------------------------------------------------------------
Johan Hedberg (2):
Bluetooth: Fix triggering BR/EDR L2CAP Connect too early
Bluetooth: Fix redundant encryption request for reauthentication

Marcel Holtmann (1):
Revert "Bluetooth: Enable autosuspend for Intel Bluetooth device"

Mohammed Habibulla (1):
Bluetooth: Add support for Lite-on [04ca:3007]

drivers/bluetooth/ath3k.c | 2 ++
drivers/bluetooth/btusb.c | 5 ++---
net/bluetooth/hci_conn.c | 9 ++++++---
net/bluetooth/hci_event.c | 6 ++++++
4 files changed, 16 insertions(+), 6 deletions(-)

Attachment: pgpKbylhfHhy2.pgp
Description: PGP signature