David S. Miller 3505d1a9fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/sfc/sfe4001.c drivers/net/wireless/libertas/cmd.c drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/rtl8187se/Kconfig drivers/staging/rtl8192e/Kconfig		2009-11-18 22:19:03 -08:00
..
Kconfig	vlan: Add GVRP support	2008-07-05 21:26:57 -07:00
Makefile	vlan: uninline __vlan_hwaccel_rx	2008-07-08 03:23:36 -07:00
vlan_core.c	vlan: Precise RX stats accounting	2009-11-17 23:51:55 -08:00
vlan_dev.c	vlan: Precise RX stats accounting	2009-11-17 23:51:55 -08:00
vlan_gvrp.c	vlan: TCI related type and naming cleanups	2008-07-08 03:24:44 -07:00
vlan_netlink.c	net: Support specifying the network namespace upon device creation.	2009-11-08 00:53:51 -08:00
vlan.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-18 22:19:03 -08:00
vlan.h	vlan: Precise RX stats accounting	2009-11-17 23:51:55 -08:00
vlanproc.c	vlan: eliminate use of dev_base_lock	2009-11-10 22:26:30 -08:00
vlanproc.h	[VLAN]: Add a net argument to proc init and cleanup calls.	2008-04-16 00:51:12 -07:00