Merge remote-tracking branch 'bluetooth/master'

diff --cc drivers/bluetooth/btusb.c
index e5921d681ddb551677a0900d4c1d82d4e6fdc53a,f077f4d28ac9c408b80074c262f76a454e8a3a44..a827f9fa24248e1ebedd8f160ef9c63c719fb10e
--- 1/drivers/bluetooth/btusb.c
--- 2/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@@ -100,11 -97,12 +100,11 @@@ static struct usb_device_id btusb_table
        { 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,3e65c021df509193e3a3903a51026c39e3a09f20..2f8013d9680e2010eac54e4ba958008579b12052
--- 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_event.c
Simple merge

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