David S. Miller 1f6d80358d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/mips/net/bpf_jit.c drivers/net/can/flexcan.c Both the flexcan and MIPS bpf_jit conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-09-23 12:09:27 -04:00
..
3c59x.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-09-23 12:09:27 -04:00
3c509.c	drivers/net: Convert remaining uses of pr_warning to pr_warn	2014-09-09 20:37:08 -07:00
3c515.c	drivers/net: Convert remaining uses of pr_warning to pr_warn	2014-09-09 20:37:08 -07:00
3c574_cs.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
3c589_cs.c	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
Kconfig	Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP	2014-04-07 16:36:11 -07:00
Makefile	drivers/net: delete old 8bit ISA 3c501 driver.	2013-01-22 10:39:49 -05:00
typhoon.c	PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use	2014-08-12 12:15:14 -06:00
typhoon.h