Merge remote-tracking branch 'bluetooth/master'

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

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

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

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

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

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