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> |
||
---|---|---|
.. | ||
c_can | ||
cc770 | ||
mscan | ||
sja1000 | ||
softing | ||
usb | ||
at91_can.c | ||
bfin_can.c | ||
dev.c | ||
flexcan.c | ||
janz-ican3.c | ||
Kconfig | ||
Makefile | ||
mcp251x.c | ||
pch_can.c | ||
slcan.c | ||
ti_hecc.c | ||
vcan.c |