Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 6 Mar 2012 02:16:26 +0000 (21:16 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 6 Mar 2012 02:16:26 +0000 (21:16 -0500)
commitf6a1ad4295f9291038380178d09978caf6982dd8
tree7c35e8efe1812baca9c6b9674be1ee02a0495ec3
parent036dafa28da1e2565a8529de2ae663c37b7a0060
parentf3969bf78f140f437f51787dfc2751943ba454d1
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>
MAINTAINERS
drivers/net/ethernet/qlogic/qla3xxx.c
drivers/net/ethernet/realtek/r8169.c
drivers/net/vmxnet3/vmxnet3_drv.c
net/core/rtnetlink.c