Conflicts: drivers/net/wireless/iwlwifi/dvm/tx.c drivers/net/wireless/ti/wlcore/sdio.c drivers/net/wireless/ti/wlcore/spi.c |
||
|---|---|---|
| .. | ||
| microread | ||
| pn544 | ||
| Kconfig | ||
| Makefile | ||
| nfcwilink.c | ||
| pn533.c | ||
Conflicts: drivers/net/wireless/iwlwifi/dvm/tx.c drivers/net/wireless/ti/wlcore/sdio.c drivers/net/wireless/ti/wlcore/spi.c |
||
|---|---|---|
| .. | ||
| microread | ||
| pn544 | ||
| Kconfig | ||
| Makefile | ||
| nfcwilink.c | ||
| pn533.c | ||