diff --git a/[refs] b/[refs]
index b5fbeb0a99e2..121a9bb972f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0f9309f371096b82ad35aa2c27d7f848f37e696
+refs/heads/master: fc2f4b13d8c91713efb972be42566f7f3625f5ed
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index 263fa2745d48..a849428ffbcb 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/net/bluetooth/mgmt.c
@@ -36,7 +36,7 @@
 
 struct pending_cmd {
 	struct list_head list;
-	__u16 opcode;
+	u16 opcode;
 	int index;
 	void *param;
 	struct sock *sk;