David S. Miller a655fe9f19 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... An ipvlan bug fix in 'net' conflicted with the abstraction away of the IPV6 specific support in 'net-next'. Similarly, a bug fix for mlx5 in 'net' conflicted with the flow action conversion in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-02-08 15:00:17 -08:00
..
21142.c	…
Kconfig	net: documentation: build a directory structure for drivers	2018-12-05 11:30:06 -08:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
de4x5.c	net: tulip: de4x5: mark expected switch fall-throughs	2018-08-07 17:54:19 -07:00
de4x5.h	net: fix up a few missing hashtable.h conflict resolutions	2016-08-13 14:51:02 -07:00
de2104x.c	net: tulip: de2104x: replace dev_kfree_skb_irq by dev_consume_skb_irq for drop profiles	2019-02-06 17:38:15 -08:00
dmfe.c	net: tulip: Convert timers to use timer_setup()	2017-10-18 12:39:38 +01:00
eeprom.c	tulip: eeprom: use struct_size() in kmalloc()	2019-02-01 15:12:29 -08:00
interrupt.c	net: tulip: Convert timers to use timer_setup()	2017-10-18 12:39:38 +01:00
media.c	tulip: cleanup by using ARRAY_SIZE()	2014-01-23 13:28:29 -08:00
pnic.c	net: tulip: Convert timers to use timer_setup()	2017-10-18 12:39:38 +01:00
pnic2.c	net: tulip: Convert timers to use timer_setup()	2017-10-18 12:39:38 +01:00
timer.c	net: tulip: Convert timers to use timer_setup()	2017-10-18 12:39:38 +01:00
tulip.h	net: tulip: Convert timers to use timer_setup()	2017-10-18 12:39:38 +01:00
tulip_core.c	net: tulip_core: mark expected switch fall-through	2018-08-07 17:54:19 -07:00
uli526x.c	net: tulip: Convert timers to use timer_setup()	2017-10-18 12:39:38 +01:00
winbond-840.c	net: tulip: Convert timers to use timer_setup()	2017-10-18 12:39:38 +01:00
xircom_cb.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00