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

Conflicts:

	drivers/net/wireless/ath5k/base.c
	net/8021q/vlan_core.c

2008-11-06 22:43: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

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

2008-11-06 22:43:03 -08:00

vlan_dev.c

net/: Kill now superfluous ->last_rx stores.

2008-11-03 22:01:07 -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

vlan: propogate ethtool speed values

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

vlan.h

vlan: propogate ethtool speed values

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

vlanproc.c

vlan: remove unnecessary include statements

2008-07-14 22:51:55 -07:00

vlanproc.h

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

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