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