David S. Miller 85dcce7a73 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/r8152.c drivers/net/xen-netback/netback.c Both the r8152 and netback conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-14 22:31:55 -04:00
..
Kconfig	8021q: update description	2014-01-21 17:01:25 -08:00
Makefile
vlan_core.c	vlan: use use ether_addr_equal_64bits to instead of ether_addr_equal	2014-03-09 19:03:51 -04:00
vlan_dev.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00
vlan_gvrp.c
vlan_mvrp.c
vlan_netlink.c	8021q: Convert uses of __constant_<foo> to <foo>	2014-03-12 15:28:06 -04:00
vlan.c	8021q: Use ether_addr_copy	2014-01-21 18:13:04 -08:00
vlan.h	8021q: Convert uses of __constant_<foo> to <foo>	2014-03-12 15:28:06 -04:00
vlanproc.c
vlanproc.h