mirror of
https://github.com/torvalds/linux.git
synced 2026-01-25 13:55:42 +08:00
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>