From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 6 Dec 2011 21:02:05 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/blueto... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5f779bbd472cdb2046ff8b672ad8c5b62b61cd19;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'master' of git://git./linux/kernel/git/padovan/bluetooth-next
---

5f779bbd472cdb2046ff8b672ad8c5b62b61cd19
diff --cc net/bluetooth/mgmt.c
index 94739d3c4f59,7a23f211d602..1ce549bae241
--- a/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>