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

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

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

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,7a23f211d60235612a6a5e93aa5e3e70cf771e48..1ce549bae241809104194b8ed545a81c35821586
--- 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>