pull request: bluetooth 2014-04-24

[Gustavo Padovan]

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.
Also we've noticed that your wireless.git tree is not up to date, so this pull
was rebased on top of net.git. If you pull from this you'll will be pulling
net/master from yesterday as well.

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

	Gustavo

---
The following changes since commit 6a51b5e4d59e00051e65e836520912cd7c717be1:

  hisax/icc: add missing semicolon after label (2014-04-22 21:22:47 -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 b66a81831359495b3768ace72452209cdf5d6614:

  Bluetooth: Add support for Lite-on [04ca:3007] (2014-04-24 12:43:33 +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: pgpsgnFuLmIQD.pgp
Description: PGP signature