mirror of
https://github.com/torvalds/linux.git
synced 2026-04-21 08:13:56 -04:00
Conflicts: drivers/net/usb/qmi_wwan.c include/net/dst.h Trivial merge conflicts, both were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>