mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-28 07:13:34 +00:00
b26d344c6b
Conflicts: drivers/net/caif/caif_hsi.c drivers/net/usb/qmi_wwan.c The qmi_wwan merge was trivial. The caif_hsi.c, on the other hand, was not. It's a conflict between |
||
---|---|---|
.. | ||
client.c | ||
error.c | ||
Kconfig | ||
Makefile | ||
mod.c | ||
protocol.c | ||
protocol.h | ||
trans_common.c | ||
trans_common.h | ||
trans_fd.c | ||
trans_rdma.c | ||
trans_virtio.c | ||
util.c |