mirror of https://github.com/torvalds/linux.git
Just minor overlapping changes in the conflicts here. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| Makefile | ||
| nic.h | ||
| nic_main.c | ||
| nic_reg.h | ||
| nicvf_ethtool.c | ||
| nicvf_main.c | ||
| nicvf_queues.c | ||
| nicvf_queues.h | ||
| q_struct.h | ||
| thunder_bgx.c | ||
| thunder_bgx.h | ||
| thunder_xcv.c | ||