Merge remote-tracking branch 'bluetooth/master'

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

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

diff --cc net/bluetooth/mgmt.c
index 94739d3c4f59ccabb5ed378c6795150a85c60c79,1ae14c91bb0c1840867435e0197a636cc6987fc8..96f63e87c28cd2c580762987d0adeae78bc8414b
--- 1/net/bluetooth/mgmt.c
--- 2/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@@ -22,8 -22,8 +22,9 @@@
  
  /* Bluetooth HCI Management interface */
  
+ #include <linux/kernel.h>
  #include <linux/uaccess.h>
 +#include <linux/module.h>
  #include <asm/unaligned.h>
  
  #include <net/bluetooth/bluetooth.h>