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

diff --cc include/net/bluetooth/hci_core.h
index ea4395f,74f8356..25c161a
--- 1/include/net/bluetooth/hci_core.h
--- 2/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@@ -592,15 -582,15 +586,13 @@@ static inline struct hci_dev *__hci_dev
        return d;
  }
  
 -static inline struct hci_dev *hci_dev_hold(struct hci_dev *d)
 -{
 -      if (try_module_get(d->owner))
 -              return __hci_dev_hold(d);
 -      return NULL;
 -}
 +#define hci_dev_hold(d)                                               \
 +({                                                            \
 +      try_module_get(d->owner) ? __hci_dev_hold(d) : NULL;    \
 +})
  
- #define hci_dev_lock(d)               spin_lock(&d->lock)
- #define hci_dev_unlock(d)     spin_unlock(&d->lock)
- #define hci_dev_lock_bh(d)    spin_lock_bh(&d->lock)
- #define hci_dev_unlock_bh(d)  spin_unlock_bh(&d->lock)
+ #define hci_dev_lock(d)               mutex_lock(&d->lock)
+ #define hci_dev_unlock(d)     mutex_unlock(&d->lock)
  
  struct hci_dev *hci_dev_get(int index);
  struct hci_dev *hci_get_route(bdaddr_t *src, bdaddr_t *dst);

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

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

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