e486463e82
Conflicts: drivers/net/usb/qmi_wwan.c net/batman-adv/translation-table.c net/ipv6/route.c qmi_wwan.c resolution provided by Bjørn Mork. batman-adv conflict is dealing merely with the changes of global function names to have a proper subsystem prefix. ipv6's route.c conflict is merely two side-by-side additions of network namespace methods. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| e1000 | ||
| e1000e | ||
| igb | ||
| igbvf | ||
| ixgb | ||
| ixgbe | ||
| ixgbevf | ||
| Kconfig | ||
| Makefile | ||
| e100.c | ||