Merge remote-tracking branch 'bluetooth/master'

diff --cc drivers/bluetooth/btusb.c
index e5921d681ddb551677a0900d4c1d82d4e6fdc53a,75943c397ad7c42b2ed89f74cc9014eab5532528..debda27df9b0452e3d7f3e5d2b06855c1b7af1f4
--- 1/drivers/bluetooth/btusb.c
--- 2/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@@ -96,15 -93,17 +96,16 @@@ static struct usb_device_id btusb_table
        { USB_DEVICE(0x0c10, 0x0000) },
  
        /* Broadcom BCM20702A0 */
+       { USB_DEVICE(0x04ca, 0x2003) },
        { USB_DEVICE(0x0489, 0xe042) },
 -      { USB_DEVICE(0x0a5c, 0x21e3) },
 -      { USB_DEVICE(0x0a5c, 0x21e6) },
 -      { USB_DEVICE(0x0a5c, 0x21e8) },
 -      { USB_DEVICE(0x0a5c, 0x21f3) },
        { USB_DEVICE(0x413c, 0x8197) },
  
        /* Foxconn - Hon Hai */
-       { USB_DEVICE(0x0489, 0xe033) },
+       { USB_VENDOR_AND_INTERFACE_INFO(0x0489, 0xff, 0x01, 0x01) },
  
 +      /*Broadcom devices with vendor specific id */
 +      { USB_VENDOR_AND_INTERFACE_INFO(0x0a5c, 0xff, 0x01, 0x01) },
 +
        { }     /* Terminating entry */
  };
  

diff --cc net/bluetooth/hci_conn.c
index 3c094e78dde98cafed3ac893abd3b2fa86b76a92,59f0344406c81762cc27fdeadfb6d318b417f8bc..b9196a44f7598bf33b0c2bff6d0764eeeba8fc11
--- 1/net/bluetooth/hci_conn.c
--- 2/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@@ -29,9 -29,8 +29,9 @@@
  #include <net/bluetooth/bluetooth.h>
  #include <net/bluetooth/hci_core.h>
  #include <net/bluetooth/a2mp.h>
 +#include <net/bluetooth/smp.h>
  
- static void hci_le_connect(struct hci_conn *conn)
+ static void hci_le_create_connection(struct hci_conn *conn)
  {
        struct hci_dev *hdev = conn->hdev;
        struct hci_cp_le_create_conn cp;

diff --cc net/bluetooth/hci_core.c
Simple merge

diff --cc net/bluetooth/hci_event.c
Simple merge

diff --cc net/bluetooth/l2cap_core.c
Simple merge

diff --cc net/bluetooth/mgmt.c
Simple merge