David S. Miller 55b42b5ca2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/marvell.c Simple overlapping changes in drivers/net/phy/marvell.c Signed-off-by: David S. Miller <davem@davemloft.net>		2014-11-01 14:53:27 -04:00
..
cassini.c	drivers/net: Convert remaining uses of pr_warning to pr_warn	2014-09-09 20:37:08 -07:00
cassini.h	ethernet: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00
Kconfig	Merge branch 'akpm' (incoming from Andrew)	2013-02-21 17:38:49 -08:00
Makefile
niu.c	drivers/net: Convert remaining uses of pr_warning to pr_warn	2014-09-09 20:37:08 -07:00
niu.h
sunbmac.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
sunbmac.h
sungem.c	sungem: Fix global namespace pollution of phy accessors.	2014-08-27 23:07:12 -07:00
sungem.h
sunhme.c	sunhme: Add DMA mapping error checks.	2014-11-01 00:23:46 -04:00
sunhme.h	sunhme: stop using net_device.{base_addr, irq}.	2012-04-07 11:47:03 +02:00
sunqe.c	net:drivers/net: Miscellaneous conversions to ETH_ALEN	2013-10-02 17:04:45 -04:00
sunqe.h
sunvnet.c	sunvnet: Use one Tx queue per vnet_port	2014-10-30 19:56:23 -04:00
sunvnet.h	sunvnet: Use one Tx queue per vnet_port	2014-10-30 19:56:23 -04:00