Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 12 Mar 2013 09:52:22 +0000 (05:52 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 12 Mar 2013 09:52:22 +0000 (05:52 -0400)
commite5f2ef7ab4690d2e8faaf5fd203c5ecd70c3abaf
tree3558f68717c70a67e18c3274bb17709a353d036f
parent30129cf28a5c99f9cb7c168f0d280f147fd6cc8b
parent3da889b616164bde76a37350cf28e0d17a94e979
Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/intel/e1000e/netdev.c

Minor conflict in e1000e, a line that got fixed in 'net'
has been removed in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>
14 files changed:
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/emulex/benet/be.h
drivers/net/ethernet/emulex/benet/be_cmds.c
drivers/net/ethernet/emulex/benet/be_hw.h
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/ethernet/intel/e1000e/ethtool.c
drivers/net/ethernet/intel/e1000e/ich8lan.c
drivers/net/ethernet/intel/e1000e/netdev.c
drivers/net/ethernet/mellanox/mlx4/en_netdev.c
drivers/net/team/team.c
drivers/net/vxlan.c
net/bridge/br_multicast.c
net/core/dev.c
net/core/rtnetlink.c