git.stricted.de - GitHub/MotorolaMobilityLLC/kernel-slsi.git/commit

author	David S. Miller <davem@davemloft.net>
	Mon, 8 Sep 2014 04:41:53 +0000 (21:41 -0700)
committer	David S. Miller <davem@davemloft.net>
	Mon, 8 Sep 2014 04:41:53 +0000 (21:41 -0700)
commit	eb84d6b60491a3ca3d90d62ee5346b007770d40d
tree	22aadf9ada15e1ae5ba4c400aafab6f2541996e6	tree \| snapshot (tar.gz zip)
parent	97a13e5289baa96eaddd06e61d277457d837af3a	commit \| diff
parent	d030671f3f261e528dc6e396a13f10859a74ae7c	commit \| diff

Merge git://git./linux/kernel/git/davem/net

24 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/xgbe/xgbe-dev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/xgbe/xgbe-drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/xgbe/xgbe-main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/xgbe/xgbe.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/cnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40evf/i40e_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx4/device.h	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/mcast.c	diff1 \|	diff2 \|	blob \| history

Motorola kernel-slsi

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/xgbe/xgbe-dev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/xgbe/xgbe-drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/xgbe/xgbe-main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/amd/xgbe/xgbe.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/cnic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40evf/i40e_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx4/device.h	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/mcast.c	diff1 \|	diff2 \|	blob \| history