Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth...

Conflicts:
	net/bluetooth/hci_core.c

diff --cc drivers/bluetooth/btusb.c
Simple merge

diff --cc net/bluetooth/hci_core.c
index e3a3499,48e1e04..cc27297
--- 1/net/bluetooth/hci_core.c
--- 2/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@@ -2165,12 -2210,8 +2168,8 @@@ int hci_register_dev(struct hci_dev *hd
  
        BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus);
  
-       write_lock(&hci_dev_list_lock);
-       list_add(&hdev->list, &hci_dev_list);
-       write_unlock(&hci_dev_list_lock);
- 
 -      hdev->workqueue = alloc_workqueue(hdev->name, WQ_HIGHPRI | WQ_UNBOUND |
 -                                        WQ_MEM_RECLAIM, 1);
 +      hdev->workqueue = alloc_workqueue("%s", WQ_HIGHPRI | WQ_UNBOUND |
 +                                        WQ_MEM_RECLAIM, 1, hdev->name);
        if (!hdev->workqueue) {
                error = -ENOMEM;
                goto err;