![]() This is to fix some conflicts in iwlwifi. Conflicts: drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c drivers/net/wireless/intel/iwlwifi/mvm/scan.c |
||
---|---|---|
.. | ||
rtl8xxxu | ||
rtl818x | ||
rtlwifi | ||
Kconfig | ||
Makefile |
![]() This is to fix some conflicts in iwlwifi. Conflicts: drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c drivers/net/wireless/intel/iwlwifi/mvm/scan.c |
||
---|---|---|
.. | ||
rtl8xxxu | ||
rtl818x | ||
rtlwifi | ||
Kconfig | ||
Makefile |