git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	David S. Miller <davem@davemloft.net>
	Thu, 13 Aug 2015 23:23:11 +0000 (16:23 -0700)
committer	David S. Miller <davem@davemloft.net>
	Thu, 13 Aug 2015 23:23:11 +0000 (16:23 -0700)
commit	c641a90d500bdf90a61f15c43355f9bfb7d69702
tree	af0b9b8da89ed03629c71f6829845c301485d289	tree \| snapshot
parent	8ae9cab8e3705a789b7358682752d35b69e22e77	commit \| diff
parent	4de8d908ad5c3f396d51ce7e239d6a66b90fab02	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cavium/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/emulex/benet/be_cmds.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/emulex/benet/be_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fec_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/gianfar_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/rocker/rocker.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/netcp_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
net/bluetooth/mgmt.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_netlink.c	diff1 \|	diff2 \|	blob \| history
net/core/pktgen.c	diff1 \|	diff2 \|	blob \| history
net/dsa/slave.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/actions.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_mirred.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/cavium/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/emulex/benet/be_cmds.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/emulex/benet/be_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fec_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/gianfar_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/rocker/rocker.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/dwmac-ipq806x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/netcp_core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/virtio_net.c	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
net/bluetooth/mgmt.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_netlink.c	diff1 \|	diff2 \|	blob \| history
net/core/pktgen.c	diff1 \|	diff2 \|	blob \| history
net/dsa/slave.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/actions.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_mirred.c	diff1 \|	diff2 \|	blob \| history