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	8021q: update description	2014-01-21 17:01:25 -08:00
Makefile	net/8021q: Implement Multiple VLAN Registration Protocol (MVRP)	2013-02-10 20:37:22 -05:00
vlan.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
vlan.h	netns: make struct pernet_operations::id unsigned int	2016-11-18 10:59:15 -05:00
vlan_core.c	vlan: Do not put vlan headers back on bridge and macvlan ports	2015-11-17 14:38:35 -05:00
vlan_dev.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
vlan_gvrp.c	net: vlan: prepare for 802.1ad support	2013-04-19 14:45:27 -04:00
vlan_mvrp.c	net: vlan: prepare for 802.1ad support	2013-04-19 14:45:27 -04:00
vlan_netlink.c	netlink: pass extended ACK struct to parsing functions	2017-04-13 13:58:22 -04:00
vlanproc.c	vlan: change return type of vlan_proc_rem_dev	2016-02-17 22:06:28 -05:00
vlanproc.h	vlan: change return type of vlan_proc_rem_dev	2016-02-17 22:06:28 -05:00