Conflicts: drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c drivers/net/wireless/iwlwifi/pcie/tx.c |
||
---|---|---|
.. | ||
hci | ||
llcp | ||
nci | ||
Kconfig | ||
Makefile | ||
af_nfc.c | ||
core.c | ||
netlink.c | ||
nfc.h | ||
rawsock.c |
Conflicts: drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c drivers/net/wireless/iwlwifi/pcie/tx.c |
||
---|---|---|
.. | ||
hci | ||
llcp | ||
nci | ||
Kconfig | ||
Makefile | ||
af_nfc.c | ||
core.c | ||
netlink.c | ||
nfc.h | ||
rawsock.c |