r8152 conflicts are the NAPI fixes in 'net' overlapping with some tasklet stuff in net-next Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| b53.txt | ||
| dsa.txt | ||
| ksz.txt | ||
| lan9303.txt | ||
| lantiq-gswip.txt | ||
| marvell.txt | ||
| mt7530.txt | ||
| qca8k.txt | ||
| realtek-smi.txt | ||
| sja1105.txt | ||
| vitesse,vsc73xx.txt | ||