Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 6 Dec 2011 21:02:05 +0000 (16:02 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 6 Dec 2011 21:02:05 +0000 (16:02 -0500)
1  2 
drivers/bluetooth/btmrvl_sdio.c
include/net/bluetooth/bluetooth.h
include/net/bluetooth/hci_core.h
net/bluetooth/l2cap_sock.c
net/bluetooth/mgmt.c

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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>