mirror of
https://github.com/ukui/kernel.git
synced 2026-03-09 10:07:04 -07: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>