David S. Miller 67ddc87f16 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/wireless/ath/ath9k/recv.c drivers/net/wireless/mwifiex/pcie.c net/ipv6/sit.c The SIT driver conflict consists of a bug fix being done by hand in 'net' (missing u64_stats_init()) whilst in 'net-next' a helper was created (netdev_alloc_pcpu_stats()) which takes care of this. The two wireless conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-05 20:32:02 -05:00
..
netxen	netxen: Use pci_enable_msix_range() instead of pci_enable_msix()	2014-02-18 15:33:33 -05:00
qlcnic	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-05 20:32:02 -05:00
qlge	qlge: Use pci_enable_msix_range() instead of pci_enable_msix()	2014-02-18 15:33:34 -05:00
Kconfig	qlcnic: dcb: Query adapter DCB capabilities.	2013-08-27 15:21:13 -04:00
Makefile
qla3xxx.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
qla3xxx.h