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
..
alx	alx: Reset phy speed after resume	2013-11-14 17:14:42 -05:00
atl1c	atl1c: Check return from pci_find_ext_capability() in atl1c_reset_pcie()	2013-12-19 19:14:42 -05:00
atl1e	atl1e: enable support for NETIF_F_RXALL and NETIF_F_RXCRC features	2013-10-03 17:01:12 -04:00
atlx	net: atl1: slight optimization of addr compare	2013-12-26 13:31:33 -05:00
Kconfig	alx: remove NET_CORE Kconfig select	2013-07-01 13:18:19 -07:00
Makefile	alx: add a simple AR816x/AR817x device driver	2013-06-17 16:04:34 -07:00