mirror of
https://github.com/LineageOS/android_kernel_fxtec_sm6115.git
synced 2026-08-23 22:51:16 +00: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>