From: David S. Miller <davem@davemloft.net>
Date: Fri, 23 Dec 2011 22:13:56 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.3-rc1~182^2~128
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=abb434cb0539fb355c1c921f8fd761efbbac3462;p=platform%2Fkernel%2Flinux-exynos.git

Merge git://git./linux/kernel/git/davem/net

Conflicts:
	net/bluetooth/l2cap_core.c

Just two overlapping changes, one added an initialization of
a local variable, and another change added a new local variable.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

abb434cb0539fb355c1c921f8fd761efbbac3462
diff --cc net/bluetooth/l2cap_core.c
index 26dc3f6,17b5b1c..9bc22e4
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@@ -2372,8 -2152,7 +2372,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);