]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 13 Aug 2015 23:23:11 +0000 (16:23 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 13 Aug 2015 23:23:11 +0000 (16:23 -0700)
commit182ad468e70fc7e8ff2e5d64344c690beaa00ddd
treeaf0b9b8da89ed03629c71f6829845c301485d289
parente8fed985d7bd6cda695e196028b54a5f3d2d91bb
parent5b3e2e14eaa2a98232a4f292341fb88438685734
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/cavium/Kconfig

The cavium conflict was overlapping dependency
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
25 files changed:
MAINTAINERS
drivers/net/bonding/bond_main.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
drivers/net/ethernet/cavium/Kconfig
drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
drivers/net/ethernet/emulex/benet/be_cmds.h
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/ethernet/freescale/fec_main.c
drivers/net/ethernet/freescale/gianfar_ethtool.c
drivers/net/ethernet/mellanox/mlx5/core/main.c
drivers/net/ethernet/rocker/rocker.c
drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c
drivers/net/ethernet/ti/netcp_core.c
drivers/net/virtio_net.c
include/linux/skbuff.h
net/bluetooth/mgmt.c
net/bridge/br_netlink.c
net/core/pktgen.c
net/dsa/slave.c
net/ipv4/tcp_ipv4.c
net/ipv6/route.c
net/ipv6/tcp_ipv6.c
net/openvswitch/actions.c
net/sched/act_mirred.c