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

Conflicts:
	net/bluetooth/l2cap_core.c

diff --cc net/bluetooth/hci_conn.c
Simple merge

diff --cc net/bluetooth/l2cap_core.c
index ea36d1d,17b5b1c..ffa2f6b
--- 1/net/bluetooth/l2cap_core.c
--- 2/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);
  

diff --cc net/bluetooth/rfcomm/core.c
Simple merge