Mark Brown reported that there are conflicts in iwlwifi between the two trees so fix those now. |
||
|---|---|---|
| .. | ||
| qtnfmac | ||
| Kconfig | ||
| Makefile | ||
Mark Brown reported that there are conflicts in iwlwifi between the two trees so fix those now. |
||
|---|---|---|
| .. | ||
| qtnfmac | ||
| Kconfig | ||
| Makefile | ||