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> |
||
|---|---|---|
| .. | ||
| ehea | ||
| emac | ||
| ibmveth.c | ||
| ibmveth.h | ||
| ibmvnic.c | ||
| ibmvnic.h | ||
| Kconfig | ||
| Makefile | ||
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> |
||
|---|---|---|
| .. | ||
| ehea | ||
| emac | ||
| ibmveth.c | ||
| ibmveth.h | ||
| ibmvnic.c | ||
| ibmvnic.h | ||
| Kconfig | ||
| Makefile | ||