linux/drivers/net/ethernet/marvell
David S. Miller 53af53ae83 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	include/linux/netdevice.h
	net/core/sock.c

Trivial merge issues.

Removal of "extern" for functions declaration in netdevice.h
at the same time "const" was added to an argument.

Two parallel line additions in net/core/sock.c

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-10-08 23:07:53 -04:00
..
Kconfig Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-04-22 20:32:51 -04:00
Makefile mv643xx_eth: convert to use the Marvell Orion MDIO driver 2013-03-22 10:25:15 -04:00
mv643xx_eth.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-10-08 23:07:53 -04:00
mvmdio.c net: mvmdio: get and enable optional clock 2013-04-08 16:55:26 -04:00
mvneta.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-09-05 14:58:52 -04:00
pxa168_eth.c net: pxa168_eth: remove deprecated IRQF_DISABLED 2013-09-15 22:01:05 -04:00
skge.c skge: fix invalid value passed to pci_unmap_sigle 2013-09-24 10:16:02 -04:00
skge.h
sky2.c net: pass info struct via netdevice notifier 2013-05-28 13:11:01 -07:00
sky2.h sky2: Receive Overflows not counted 2013-03-29 14:53:19 -04:00