Minor conflict in r8169, bug fix had two versions in net and net-next, take the net-next hunks. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| ipw2x00 | ||
| iwlegacy | ||
| iwlwifi | ||
| Kconfig | ||
| Makefile | ||
Minor conflict in r8169, bug fix had two versions in net and net-next, take the net-next hunks. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| ipw2x00 | ||
| iwlegacy | ||
| iwlwifi | ||
| Kconfig | ||
| Makefile | ||