Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...

Conflicts:
	drivers/bluetooth/btusb.c

diff --cc drivers/bluetooth/btusb.c
index a7dfbf9a3afb6be53e372f78d9ee8202bdb17d08,8f579cd9bbaf398489764ea3e78ecca2146d818d..a1c80b0c7663d25baf2224bae0513b3bb29c6543
--- 1/drivers/bluetooth/btusb.c
--- 2/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@@ -1486,8 -1635,13 +1636,11 @@@ static int btusb_probe(struct usb_inter
        if (id->driver_info & BTUSB_BCM92035)
                hdev->setup = btusb_setup_bcm92035;
  
 -      if (id->driver_info & BTUSB_INTEL) {
 -              usb_enable_autosuspend(data->udev);
+       if (id->driver_info & BTUSB_BCM_PATCHRAM)
+               hdev->setup = btusb_setup_bcm_patchram;
+ 
 +      if (id->driver_info & BTUSB_INTEL)
                hdev->setup = btusb_setup_intel;
 -      }
  
        /* Interface numbers are hardcoded in the specification */
        data->isoc = usb_ifnum_to_if(data->udev, 1);

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

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

diff --cc net/bluetooth/rfcomm/core.c
Simple merge