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://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abb434cb0539fb355c1c921f8fd761efbbac3462;p=pandora-kernel.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
Reading git-diff-tree failed