linux_dsm_epyc7002/drivers/net/ethernet/qlogic
David S. Miller 95f873f2ff Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	arch/arm/boot/dts/imx6sx-sdb.dts
	net/sched/cls_bpf.c

Two simple sets of overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 16:59:56 -08:00
..
netxen Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-01-27 16:59:56 -08:00
qlcnic net: rename vlan_tx_* helpers since "tx" is misleading there 2015-01-13 17:51:08 -05:00
qlge net: rename vlan_tx_* helpers since "tx" is misleading there 2015-01-13 17:51:08 -05:00
Kconfig qlcnic: Fix Kconfig dependency on HWMON 2014-05-07 17:23:25 -04:00
Makefile
qla3xxx.c qla3xxx: don't allow never end busy loop 2015-01-06 17:41:36 -05:00
qla3xxx.h