5a8529de2ae663c37b7a0060
parent f3969bf78f140f437f51787dfc2751943ba454d1
author David S. Miller <davem@davemloft.net> 1331000186 -0500
committer David S. Miller <davem@davemloft.net> 1331000186 -0500

Merge git://git.kernel.org/pub/scm/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>
�����3x