Conflicts: Documentation/feature-removal-schedule.txt drivers/scsi/fcoe/fcoe.c net/core/drop_monitor.c net/core/net-traces.c |
||
---|---|---|
.. | ||
Makefile | ||
defines.h | ||
ethtool.c | ||
igbvf.h | ||
mbx.c | ||
mbx.h | ||
netdev.c | ||
regs.h | ||
vf.c | ||
vf.h |
Conflicts: Documentation/feature-removal-schedule.txt drivers/scsi/fcoe/fcoe.c net/core/drop_monitor.c net/core/net-traces.c |
||
---|---|---|
.. | ||
Makefile | ||
defines.h | ||
ethtool.c | ||
igbvf.h | ||
mbx.c | ||
mbx.h | ||
netdev.c | ||
regs.h | ||
vf.c | ||
vf.h |