From: Gustavo F. Padovan <padovan@profusion.mobi>
Date: Mon, 19 Dec 2011 13:37:53 +0000 (-0200)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth
X-Git-Tag: v3.3-rc1~182^2~44^2~71^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4b0b2f088f12e2ada1297502d7bebde182cf65b0;p=~emulex%2Finfiniband.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth

Conflicts:
	net/bluetooth/l2cap_core.c
---

4b0b2f088f12e2ada1297502d7bebde182cf65b0
diff --cc net/bluetooth/l2cap_core.c
index ea36d1dea76,17b5b1cd965..ffa2f6b8408
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@@ -2416,8 -2152,7 +2416,8 @@@ static int l2cap_parse_conf_rsp(struct 
  	void *ptr = req->data;
  	int type, olen;
  	unsigned long val;
- 	struct l2cap_conf_rfc rfc;
+ 	struct l2cap_conf_rfc rfc = { .mode = L2CAP_MODE_BASIC };
 +	struct l2cap_conf_efs efs;
  
  	BT_DBG("chan %p, rsp %p, len %d, req %p", chan, rsp, len, data);