mirror of
https://github.com/torvalds/linux.git
synced 2026-02-04 15:28:49 +08:00
Conflicts: drivers/net/usb/qmi_wwan.c Overlapping additions of new device IDs to qmi_wwan.c Signed-off-by: David S. Miller <davem@davemloft.net>