David S. Miller 2e2d6f0342 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... net/sched/cls_api.c has overlapping changes to a call to nlmsg_parse(), one (from 'net') added rtm_tca_policy instead of NULL to the 5th argument, and another (from 'net-next') added cb->extack instead of NULL to the 6th argument. net/ipv4/ipmr_base.c is a case of a bug fix in 'net' being done to code which moved (to mr_table_dump)) in 'net-next'. Thanks to David Ahern for the heads up. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-10-19 11:03:06 -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: add missing Kconfig dependency	2018-08-17 12:24:13 -07: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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-10-19 11:03:06 -07:00