Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 29 Mar 2014 22:48:54 +0000 (18:48 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 29 Mar 2014 22:48:54 +0000 (18:48 -0400)
commit64c27237a07129758e33f5f824ba5c33b7f57417
tree4c0c0a9b6d282d600f2226e1b3510096b9d789dd
parent77a9939426f7a3f35f460afc9b11f1fe45955409
parent49d8137a4039c63c834827f4bfe875e27bb9c521
Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/marvell/mvneta.c

The mvneta.c conflict is a case of overlapping changes,
a conversion to devm_ioremap_resource() vs. a conversion
to netdev_alloc_pcpu_stats.

Signed-off-by: David S. Miller <davem@davemloft.net>
19 files changed:
MAINTAINERS
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/marvell/mvneta.c
drivers/net/ethernet/mellanox/mlx4/main.c
drivers/net/ethernet/qlogic/qlge/qlge_main.c
drivers/net/ifb.c
drivers/net/veth.c
drivers/net/virtio_net.c
include/linux/netdevice.h
include/linux/skbuff.h
net/8021q/vlan_dev.c
net/bridge/br_device.c
net/bridge/br_vlan.c
net/core/dev.c
net/core/skbuff.c
net/ipv4/ip_tunnel.c
net/ipv4/ip_tunnel_core.c
net/ipv4/tcp_ipv4.c
net/openvswitch/datapath.c