-
git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netDavid S. Miller authored
Minor conflict in r8169, bug fix had two versions in net and net-next, take the net-next hunks. Signed-off-by:David S. Miller <davem@davemloft.net>
68aaf445
Minor conflict in r8169, bug fix had two versions in net
and net-next, take the net-next hunks.
Signed-off-by: David S. Miller <davem@davemloft.net>