David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-06-15 11:59:32 -04:00

..

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

…