David S. Miller a06ee256e5 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... Version bump conflict in batman-adv, take what's in net-next. iavf conflict, adjustment of netdev_ops in net-next conflicting with poll controller method removal in net. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-09-25 10:35:29 -07:00
..
core.c	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-09-25 10:35:29 -07:00
core.h	net/ibm/emac: Remove VLA usage	2018-09-13 16:53:24 -07:00
debug.h	net: Convert to using %pOF instead of full_name	2017-07-24 13:41:48 -07:00
emac.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-01-24 23:44:15 -05:00
Kconfig	net: emac: add support for device-tree based PHY discovery and setup	2017-02-22 15:36:47 -05:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
mal.c	net: emac: Fix napi poll list corruption	2017-09-19 16:20:25 -07:00
mal.h	net: ethernet: Use DIV_ROUND_UP instead of reimplementing its function	2018-09-12 20:34:47 -07:00
phy.c	net: ibm: emac: replace custom PHY_MODE_* macros	2017-12-21 13:09:41 -05:00
phy.h
rgmii.c	net: ibm: emac: support RGMII-[RX|TX]ID phymode	2017-12-21 13:09:41 -05:00
rgmii.h	ibm/emac: Remove extern from function prototypes	2013-09-24 12:51:27 -07:00
tah.c	net: Convert to using %pOF instead of full_name	2017-07-24 13:41:48 -07:00
tah.h	ibm/emac: Remove extern from function prototypes	2013-09-24 12:51:27 -07:00
zmii.c	net: ibm: emac: replace custom PHY_MODE_* macros	2017-12-21 13:09:41 -05:00
zmii.h	ibm/emac: Remove extern from function prototypes	2013-09-24 12:51:27 -07:00