David S. Miller 22f10923dd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/amd/xgbe/xgbe-desc.c drivers/net/ethernet/renesas/sh_eth.c Overlapping changes in both conflict cases. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-12-10 15:48:20 -05:00
..
xgbe	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-12-10 15:48:20 -05:00
7990.c
7990.h
a2065.c
a2065.h
am79c961a.c
am79c961a.h
amd8111e.c	ethernet: amd: fix 'foo* bar'	2014-07-14 19:14:15 -07:00
amd8111e.h
ariadne.c
ariadne.h
atarilance.c
au1000_eth.c	ethernet: amd: use pr_info_once()	2014-09-12 18:02:41 -04:00
au1000_eth.h
declance.c	declance: Fix 64-bit compilation warnings	2014-07-08 14:04:30 -07:00
hplance.c
hplance.h
Kconfig	amd-xgbe: Let AMD_XGBE depend on HAS_IOMEM	2014-11-05 21:50:13 -05:00
lance.c
Makefile
mvme147.c
ni65.c
ni65.h
nmclan_cs.c	am2150: Update nmclan_cs.c to use update PCMCIA API	2014-09-22 14:27:44 -04:00
pcnet32.c	PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use	2014-08-12 12:15:14 -06:00
sun3lance.c
sunlance.c