David S. Miller 64c27237a0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/marvell/mvneta.c The mvneta.c conflict is a case of overlapping changes, a conversion to devm_ioremap_resource() vs. a conversion to netdev_alloc_pcpu_stats. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-29 18:48:54 -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	vlan: Set hard_header_len according to available acceleration	2014-03-27 15:00:37 -04:00
vlan.h	8021q: Convert uses of __constant_<foo> to <foo>	2014-03-12 15:28:06 -04:00
vlan_core.c	vlan: make a new function vlan_dev_vlan_proto() and export	2014-03-26 16:41:28 -04:00
vlan_dev.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-29 18:48:54 -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	8021q: Convert uses of __constant_<foo> to <foo>	2014-03-12 15:28:06 -04:00
vlanproc.c	proc: Supply a function to remove a proc entry by PDE	2013-05-01 17:29:46 -04:00
vlanproc.h	[VLAN]: Add a net argument to proc init and cleanup calls.	2008-04-16 00:51:12 -07:00