68aaf44595
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> |
||
---|---|---|
.. | ||
internal.h | ||
Kconfig | ||
Makefile | ||
ncsi-aen.c | ||
ncsi-cmd.c | ||
ncsi-manage.c | ||
ncsi-netlink.c | ||
ncsi-netlink.h | ||
ncsi-pkt.h | ||
ncsi-rsp.c |