You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David S. Miller 9f6ec8d697 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/wireless/iwlwifi/iwl-agn-rxon.c drivers/net/wireless/rtlwifi/pci.c net/netfilter/ipvs/ip_vs_core.c		14 years ago
..
Kconfig	vlan: Add GVRP support	17 years ago
Makefile	vlan: uninline __vlan_hwaccel_rx	17 years ago
vlan.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	14 years ago
vlan.h	net: move is_vlan_dev into public header file (v2)	14 years ago
vlan_core.c	vlan: Fix the ingress VLAN_FLAG_REORDER_HDR check	14 years ago
vlan_dev.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	14 years ago
vlan_gvrp.c	vlan: TCI related type and naming cleanups	17 years ago
vlan_netlink.c	vlan: lockless transmit path	14 years ago
vlanproc.c	net: Remove casts of void *	14 years ago
vlanproc.h	[VLAN]: Add a net argument to proc init and cleanup calls.	17 years ago