David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/bcm7xxx.c drivers/net/phy/marvell.c drivers/net/vxlan.c All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-02-23 00:09:14 -05:00
..
cpmac.c	net: ti: cpmac: Fix build error due to missed API change	2016-01-10 23:34:49 -05:00
cpsw_ale.c
cpsw_ale.h
cpsw-common.c	net: cpsw: Fix ethernet regression for dm814x	2015-11-20 10:46:33 -05:00
cpsw-phy-sel.c	drivers: net: cpsw-phy-sel: add dev_warn() for unsupported PHY mode	2016-02-17 10:50:15 -05:00
cpsw.c	phy: Add an mdio_device structure	2016-01-07 14:31:26 -05:00
cpsw.h
cpts.c
cpts.h
davinci_cpdma.c	net: davinci_cpdma: use dma_addr_t for DMA address	2016-01-29 20:33:38 -08:00
davinci_cpdma.h
davinci_emac.c	phy: Centralise print about attached phy	2016-01-07 14:31:25 -05:00
davinci_mdio.c	phy: Add API for {un}registering an mdio device to a bus.	2016-01-07 14:31:26 -05:00
Kconfig
Makefile
netcp_core.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
netcp_ethss.c	phy: add phydev_name() wrapper	2016-01-07 14:31:25 -05:00
netcp_sgmii.c
netcp_xgbepcsr.c
netcp.h	netcp: add more __le32 annotations	2015-12-11 19:34:39 -05:00
tlan.c
tlan.h