David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-06-15 11:59:32 -04:00
..
core.c	net: emac: fix and unify emac_mdio functions	2017-06-08 10:47:21 -04:00
core.h	net: emac: Use net_device_stats from struct net_device	2017-04-07 07:03:33 -07:00
debug.h	net: ibm: emac: remove unused sysrq handler for 'c' key	2017-04-05 07:26:18 -07:00
emac.h
Kconfig	net: emac: add support for device-tree based PHY discovery and setup	2017-02-22 15:36:47 -05:00
Makefile	net: ibm: emac: remove unused sysrq handler for 'c' key	2017-04-05 07:26:18 -07:00
mal.c	net: ibm: emac: remove unused sysrq handler for 'c' key	2017-04-05 07:26:18 -07:00
mal.h
phy.c	drivers: net: emac: add const to mii_phy_ops structures	2017-06-08 15:32:48 -04:00
phy.h
rgmii.c
rgmii.h
tah.c
tah.h
zmii.c
zmii.h