Merge remote-tracking branch 'bluetooth/master'

Conflicts:
	net/bluetooth/hci_core.c
	net/bluetooth/l2cap_core.c
	net/bluetooth/mgmt.c
	net/bluetooth/smp.c

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

diff --cc include/net/bluetooth/l2cap.h
Simple merge

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

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

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