Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 19 Feb 2014 06:24:22 +0000 (01:24 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 19 Feb 2014 06:24:22 +0000 (01:24 -0500)
commit1e8d6421cff2c24fe0b345711e7a21af02e8bcf5
tree773b30106efb9b48055bc93958e5a94ac53768ce
parentf7b12606b5de323a2bb5ca1696558efde8f25441
parent960dfc4eb23a28495276b02604d7458e0e1a1ed8
Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/bonding/bond_3ad.h
drivers/net/bonding/bond_main.c

Two minor conflicts in bonding, both of which were overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
16 files changed:
MAINTAINERS
drivers/net/bonding/bond_3ad.c
drivers/net/bonding/bond_3ad.h
drivers/net/bonding/bond_main.c
drivers/net/bonding/bond_options.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
drivers/net/ethernet/ti/cpsw.c
drivers/net/hyperv/netvsc_drv.c
drivers/net/macvlan.c
drivers/net/team/team.c
include/linux/netdevice.h
net/core/rtnetlink.c
net/ipv4/ip_forward.c
net/ipv4/route.c
net/tipc/link.c