Conflicts: drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c |
||
|---|---|---|
| .. | ||
| can | ||
| broadcom-bcm87xx.txt | ||
| calxeda-xgmac.txt | ||
| davinci_emac.txt | ||
| fsl-fec.txt | ||
| fsl-tsec-phy.txt | ||
| lpc-eth.txt | ||
| macb.txt | ||
| mdio-gpio.txt | ||
| mdio-mux-gpio.txt | ||
| mdio-mux.txt | ||
| phy.txt | ||
| smsc-lan91c111.txt | ||
| smsc911x.txt | ||
| stmmac.txt | ||