David S. Miller e6ff4c75f9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Merge net into net-next because some upcoming net-next changes build on top of bug fixes that went into net. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-05-24 16:48:28 -07:00
..
netxen	net: vlan: rename NETIF_F_HW_VLAN_* feature flags to NETIF_F_HW_VLAN_CTAG_*	2013-04-19 14:45:26 -04:00
qlcnic	qlcnic: Fix updating netdev->features	2013-05-22 14:52:40 -07:00
qlge	net/ethernet/qlogic/qlge/qlge_main: Use module_pci_driver to register driver	2013-05-22 14:35:04 -07:00
Kconfig	qlcnic: Support SR-IOV enable and disable	2013-03-29 15:46:08 -04:00
Makefile
qla3xxx.c	drivers:net: Remove unnecessary OOM messages after netdev_alloc_skb	2013-03-09 16:09:19 -05:00
qla3xxx.h