David S. Miller 53af53ae83 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: include/linux/netdevice.h net/core/sock.c Trivial merge issues. Removal of "extern" for functions declaration in netdevice.h at the same time "const" was added to an argument. Two parallel line additions in net/core/sock.c Signed-off-by: David S. Miller <davem@davemloft.net>		2013-10-08 23:07:53 -04:00
..
Kconfig	net: vlan: add 802.1ad support	2013-04-19 14:46:06 -04:00
Makefile	net/8021q: Implement Multiple VLAN Registration Protocol (MVRP)	2013-02-10 20:37:22 -05:00
vlan.c	vlan: unlink the upper neighbour before unregistering	2013-09-26 16:02:07 -04:00
vlan.h	net: vlan: fix up vlan_proto_idx() for CONFIG_BUG=n	2013-04-21 15:58:19 -04:00
vlan_core.c	vlan: make vlan_dev_real_dev work over stacked vlans	2013-08-05 12:17:42 -07:00
vlan_dev.c	net: vlan: inherit addr_assign_type along with dev_addr	2013-09-03 20:57:49 -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	net: vlan: fix nlmsg size calculation in vlan_get_size()	2013-10-08 16:32:41 -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