David S. Miller 56a4342dfe Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c net/ipv6/ip6_tunnel.c net/ipv6/ip6_vti.c ipv6 tunnel statistic bug fixes conflicting with consolidation into generic sw per-cpu net stats. qlogic conflict between queue counting bug fix and the addition of multiple MAC address support. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-01-06 17:37:45 -05: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	net: mv643xx_eth: properly start/stop phy device	2013-12-17 14:42:43 -05:00
mvmdio.c	net: mvmdio: fix interrupt timeout handling	2013-12-19 19:20:44 -05:00
mvneta.c	net: mvneta: Fix incorrect DMA unmapping size	2013-12-06 15:43:44 -05:00
pxa168_eth.c	net: pxa168_eth: use phy_init_hw for PHY reset	2013-12-09 20:38:59 -05:00
skge.c	net: skge: remove unnecessary pci_set_drvdata()	2013-10-21 17:21:01 -04:00
skge.h
sky2.c	net: sky2 calls skb_set_hash	2013-12-18 15:00:52 -05:00
sky2.h	sky2: Receive Overflows not counted	2013-03-29 14:53:19 -04:00