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

diff --combined drivers/bluetooth/ath3k.c
index a8a41e07a221695684fd78770980749b25ff2b5a,3095d2e74f24b64681a7d4974bef22ca6ce44277..b282af181b44dc974daab7ef4941e9373b833506
--- 1/drivers/bluetooth/ath3k.c
--- 2/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@@ -74,8 -74,10 +74,10 @@@ static struct usb_device_id ath3k_table
  
        /* Atheros AR3012 with sflash firmware*/
        { USB_DEVICE(0x0CF3, 0x3004) },
+       { USB_DEVICE(0x0CF3, 0x3008) },
        { USB_DEVICE(0x0CF3, 0x311D) },
        { USB_DEVICE(0x13d3, 0x3375) },
+       { USB_DEVICE(0x04CA, 0x3004) },
        { USB_DEVICE(0x04CA, 0x3005) },
        { USB_DEVICE(0x04CA, 0x3006) },
        { USB_DEVICE(0x04CA, 0x3008) },
@@@ -106,8 -108,10 +108,10 @@@ static struct usb_device_id ath3k_blist
  
        /* Atheros AR3012 with sflash firmware*/
        { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },
        { USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },
        { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },
        { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
        { USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },
        { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },
@@@ -349,7 -353,7 +353,7 @@@ static int ath3k_load_syscfg(struct usb
  
        ret = ath3k_get_state(udev, &fw_state);
        if (ret < 0) {
 -              BT_ERR("Can't get state to change to load configration err");
 +              BT_ERR("Can't get state to change to load configuration err");
                return -EBUSY;
        }