-
git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netDavid S. Miller authored
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>
765b7590
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>