linux_dsm_epyc7002/drivers/net/ethernet/qlogic
David S. Miller dda922c831 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/phy/amd-xgbe-phy.c
	drivers/net/wireless/iwlwifi/Kconfig
	include/net/mac80211.h

iwlwifi/Kconfig and mac80211.h were both trivial overlapping
changes.

The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and
the bug fix that happened on the 'net' side is already integrated
into the rest of the amd-xgbe driver.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-06-01 22:51:30 -07:00
..
netxen net: netxen: correct sysfs bin attribute return code 2015-05-27 00:25:33 -04:00
qlcnic net: qlcnic: clean up sysfs error codes 2015-05-28 20:14:45 -07:00
qlge qlge: Move jiffies_to_usecs immediately before loop 2015-05-21 17:23:18 -04:00
Kconfig
Makefile
qla3xxx.c qla3xxx: don't allow never end busy loop 2015-01-06 17:41:36 -05:00
qla3xxx.h