David S. Miller c4c5551df1 Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux ... All conflicts were trivial overlapping changes, so reasonably easy to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-07-20 21:17:12 -07:00
..
8139cp.c	8139cp: Replace WARN_ONCE with netdev_WARN_ONCE	2018-01-08 20:53:15 -05:00
8139too.c	8139too: Remove unnecessary netif_napi_del()	2018-05-25 16:35:45 -04:00
Kconfig	r8169: use phy_ethtool_nway_reset	2018-07-18 09:46:32 +09:00
Makefile	…
atp.c	drivers/net: realtek: Convert timers to use timer_setup()	2017-10-27 12:09:16 +09:00
atp.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
r8169.c	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07:00