mirror of
https://github.com/torvalds/linux.git
synced 2026-05-07 15:55:27 -04:00
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>