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 | ||
ocelot_ana.h | ||
ocelot_board.c | ||
ocelot_dev.h | ||
ocelot_hsio.h | ||
ocelot_io.c | ||
ocelot_qs.h | ||
ocelot_qsys.h | ||
ocelot_regs.c | ||
ocelot_rew.h | ||
ocelot_sys.h | ||
ocelot.c | ||
ocelot.h |