From: David S. Miller <davem@davemloft.net>
Date: Tue, 6 Mar 2012 02:16:26 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.4-rc1~177^2~135
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6a1ad4295f9291038380178d09978caf6982dd8;p=pandora-kernel.git

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

Conflicts:
	drivers/net/vmxnet3/vmxnet3_drv.c

Small vmxnet3 conflict with header size bug fix in 'net'.

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

f6a1ad4295f9291038380178d09978caf6982dd8
Reading git-diff-tree failed