![]() 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> |
||
---|---|---|
.. | ||
adf7242.c | ||
at86rf230.c | ||
at86rf230.h | ||
atusb.c | ||
atusb.h | ||
ca8210.c | ||
cc2520.c | ||
fakelb.c | ||
Kconfig | ||
mac802154_hwsim.c | ||
mac802154_hwsim.h | ||
Makefile | ||
mcr20a.c | ||
mcr20a.h | ||
mrf24j40.c |