From: David S. Miller <davem@davemloft.net>
Date: Sat, 26 Nov 2011 19:47:03 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.3-rc1~182^2~499
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c;p=pandora-kernel.git

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

Conflicts:
	net/ipv4/inet_diag.c
---

6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c
Reading git-diff-tree failed