From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 18 Nov 2011 01:37:39 +0000 (+1100)
Subject: Merge remote-tracking branch 'bluetooth/master'
X-Git-Tag: next-20111118~40
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a493486b6a053a1fd5844de8f4e85153d2c50ff5;p=karo-tx-linux.git

Merge remote-tracking branch 'bluetooth/master'
---

a493486b6a053a1fd5844de8f4e85153d2c50ff5
diff --cc net/bluetooth/mgmt.c
index 94739d3c4f59,1ae14c91bb0c..96f63e87c28c
--- 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>