]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit
projects / ceph-client.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f7b1260 960dfc4)
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
tree773b30106efb9b48055bc93958e5a94ac53768cetree | snapshot
parentf7b12606b5de323a2bb5ca1696558efde8f25441commit | diff
parent960dfc4eb23a28495276b02604d7458e0e1a1ed8commit | diff
Merge git://git.kernel.org/pub/scm/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 diff1 | diff2 | blob | history
drivers/net/bonding/bond_3ad.c diff1 | diff2 | blob | history
drivers/net/bonding/bond_3ad.h diff1 | diff2 | blob | history
drivers/net/bonding/bond_main.c diff1 | diff2 | blob | history
drivers/net/bonding/bond_options.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h diff1 | diff2 | blob | history
drivers/net/ethernet/ti/cpsw.c diff1 | diff2 | blob | history
drivers/net/hyperv/netvsc_drv.c diff1 | diff2 | blob | history
drivers/net/macvlan.c diff1 | diff2 | blob | history
drivers/net/team/team.c diff1 | diff2 | blob | history
include/linux/netdevice.h diff1 | diff2 | blob | history
net/core/rtnetlink.c diff1 | diff2 | blob | history
net/ipv4/ip_forward.c diff1 | diff2 | blob | history
net/ipv4/route.c diff1 | diff2 | blob | history
net/tipc/link.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.