27058af401
Mostly simple overlapping changes. For example, David Ahern's adjacency list revamp in 'net-next' conflicted with an adjacency list traversal bug fix in 'net'. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
vlan_core.c | ||
vlan_dev.c | ||
vlan_gvrp.c | ||
vlan_mvrp.c | ||
vlan_netlink.c | ||
vlan.c | ||
vlan.h | ||
vlanproc.c | ||
vlanproc.h |