![]() 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> |
||
---|---|---|
.. | ||
conntrack.h | ||
core.h | ||
dccp.h | ||
generic.h | ||
hash.h | ||
ipv4.h | ||
ipv6.h | ||
mib.h | ||
packet.h | ||
sctp.h | ||
unix.h | ||
x_tables.h | ||
xfrm.h |