![]() Version bump conflict in batman-adv, take what's in net-next. iavf conflict, adjustment of netdev_ops in net-next conflicting with poll controller method removal in net. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
hci | ||
nci | ||
af_nfc.c | ||
core.c | ||
digital.h | ||
digital_core.c | ||
digital_dep.c | ||
digital_technology.c | ||
Kconfig | ||
llcp.h | ||
llcp_commands.c | ||
llcp_core.c | ||
llcp_sock.c | ||
Makefile | ||
netlink.c | ||
nfc.h | ||
rawsock.c |