From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 24 Sep 2012 18:39:16 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth... 
X-Git-Tag: v3.7-rc1~145^2~30^2~104
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=791ef39cd18ae2745a63c51a5dbbd23312be0744;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'master' of git://git./linux/kernel/git/bluetooth/bluetooth-next
---

791ef39cd18ae2745a63c51a5dbbd23312be0744
diff --cc drivers/bluetooth/btusb.c
index e5921d6,75943c3..debda27
--- a/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 3c094e7,59f0344..b9196a4
--- a/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;