forked from Minki/linux
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> |
||
|---|---|---|
| .. | ||
| ipoib_cm.c | ||
| ipoib_ethtool.c | ||
| ipoib_fs.c | ||
| ipoib_ib.c | ||
| ipoib_main.c | ||
| ipoib_multicast.c | ||
| ipoib_netlink.c | ||
| ipoib_verbs.c | ||
| ipoib_vlan.c | ||
| ipoib.h | ||
| Kconfig | ||
| Makefile | ||