OpenCloudOS-Kernel/drivers/net/ethernet/qlogic
David S. Miller f666f87b94 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/xen-netback/netback.c
	net/core/filter.c

A filter bug fix overlapped some cleanups and a conversion
over to some new insn generation macros.

A xen-netback bug fix overlapped the addition of multi-queue
support.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-06-05 16:22:02 -07:00
..
netxen net: get rid of SET_ETHTOOL_OPS 2014-05-13 17:43:20 -04:00
qlcnic Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-06-05 16:22:02 -07:00
qlge net: get rid of SET_ETHTOOL_OPS 2014-05-13 17:43:20 -04:00
Kconfig qlcnic: Fix Kconfig dependency on HWMON 2014-05-07 17:23:25 -04:00
Makefile
qla3xxx.c net: get rid of SET_ETHTOOL_OPS 2014-05-13 17:43:20 -04:00
qla3xxx.h