mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-20 17:44:33 +08:00
6a06e5e1bb
Conflicts: drivers/net/team/team.c drivers/net/usb/qmi_wwan.c net/batman-adv/bat_iv_ogm.c net/ipv4/fib_frontend.c net/ipv4/route.c net/l2tp/l2tp_netlink.c The team, fib_frontend, route, and l2tp_netlink conflicts were simply overlapping changes. qmi_wwan and bat_iv_ogm were of the "use HEAD" variety. With help from Antonio Quartulli. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
cm.c | ||
cq.c | ||
device.c | ||
ev.c | ||
id_table.c | ||
iw_cxgb4.h | ||
Kconfig | ||
Makefile | ||
mem.c | ||
provider.c | ||
qp.c | ||
resource.c | ||
t4.h | ||
t4fw_ri_api.h | ||
user.h |