Conflicts: include/net/ipip.h The changes made to ipip.h in 'net' were already included in 'net-next' before that header was moved to another location. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
defines.h | ||
ethtool.c | ||
ixgbevf_main.c | ||
ixgbevf.h | ||
Makefile | ||
mbx.c | ||
mbx.h | ||
regs.h | ||
vf.c | ||
vf.h |