All conflicts were trivial overlapping changes, so reasonably easy to resolve. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| rtl8xxxu | ||
| rtl818x | ||
| rtlwifi | ||
| Kconfig | ||
| Makefile | ||
All conflicts were trivial overlapping changes, so reasonably easy to resolve. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| rtl8xxxu | ||
| rtl818x | ||
| rtlwifi | ||
| Kconfig | ||
| Makefile | ||