openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/net/8021q
History
David S. Miller 49997d7515 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 
Conflicts:

	Documentation/powerpc/booting-without-of.txt
	drivers/atm/Makefile
	drivers/net/fs_enet/fs_enet-main.c
	drivers/pci/pci-acpi.c
	net/8021q/vlan.c
	net/iucv/iucv.c
 		2008-07-18 02:39:39 -07: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.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 2008-07-18 02:39:39 -07:00
vlan.h vlan: TCI related type and naming cleanups 2008-07-08 03:24:44 -07:00
vlan_core.c vlan: deliver packets received with VLAN acceleration to network taps 2008-07-14 22:49:30 -07:00
vlan_dev.c netdev: Allocate multiple queues for TX. 2008-07-17 19:21:00 -07: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
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