David S. Miller 508827ff0a Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/tokenring/tmspci.c
	drivers/net/ucc_geth_mii.c

2009-03-05 02:06:47 -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

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-03-01 21:35:16 -08:00

vlan_dev.c

vlan: Fix vlan-in-vlan crashes.

2009-03-04 23:46:25 -08:00

vlan_gvrp.c

vlan: TCI related type and naming cleanups

2008-07-08 03:24:44 -07:00

vlan_netlink.c

vlan: Add GVRP support

2008-07-05 21:26:57 -07:00

vlan.c

net: replace uses of __constant_{endian}

2009-02-01 00:45:17 -08:00

vlan.h

vlan: propogate ethtool speed values

2008-10-28 23:02:34 -07:00

vlanproc.c

vlan: Fix typos in proc output string

2008-11-10 13:37:40 -08:00

vlanproc.h

[VLAN]: Add a net argument to proc init and cleanup calls.

2008-04-16 00:51:12 -07:00