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> |
||
---|---|---|
.. | ||
bootp | ||
compressed | ||
dts | ||
.gitignore | ||
install.sh | ||
Makefile |
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> |
||
---|---|---|
.. | ||
bootp | ||
compressed | ||
dts | ||
.gitignore | ||
install.sh | ||
Makefile |