Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth

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

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

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

diff --cc net/bluetooth/mgmt.c
index 38220a2dc31e9f3e45daf98f6dae303d9d026369,99251d19bf6faef3655267c8daf50a0f5b012501..cbc8a6dfa5ed3e665355564907886fb8189792f7
--- 1/net/bluetooth/mgmt.c
--- 2/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@@ -147,11 -142,11 +147,9 @@@ static int read_index_list(struct sock 
        put_unaligned_le16(count, &rp->num_controllers);
  
        i = 0;
 -      list_for_each(p, &hci_dev_list) {
 -              struct hci_dev *d = list_entry(p, struct hci_dev, list);
 -
 +      list_for_each_entry(d, &hci_dev_list, list) {
                hci_del_off_timer(d);
  
-               set_bit(HCI_MGMT, &d->flags);
- 
                if (test_bit(HCI_SETUP, &d->flags))
                        continue;
  

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