linux_dsm_epyc7002/drivers/net/ethernet/qlogic
David S. Miller 5510b3c2a1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	arch/s390/net/bpf_jit_comp.c
	drivers/net/ethernet/ti/netcp_ethss.c
	net/bridge/br_multicast.c
	net/ipv4/ip_fragment.c

All four conflicts were cases of simple overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-07-31 23:52:20 -07:00
..
netxen net: netxen: correct sysfs bin attribute return code 2015-05-27 00:25:33 -04:00
qlcnic Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-07-31 23:52:20 -07:00
qlge qlge: Move jiffies_to_usecs immediately before loop 2015-05-21 17:23:18 -04:00
Kconfig drivers/net: remove all references to obsolete Ethernet-HOWTO 2015-06-23 06:50:35 -07:00
Makefile
qla3xxx.c qla3xxx: don't allow never end busy loop 2015-01-06 17:41:36 -05:00
qla3xxx.h