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

diff --cc drivers/net/wireless/rtlwifi/pci.c
Simple merge

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

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

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

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

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