mirror of
https://github.com/torvalds/linux.git
synced 2024-12-30 14:52:05 +00:00
a06ee256e5
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> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
ravb_main.c | ||
ravb_ptp.c | ||
ravb.h | ||
sh_eth.c | ||
sh_eth.h |