linux/net/8021q
David S. Miller 577f99c1d0 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/8021q/vlan_dev.c
2008-03-18 00:37:55 -07:00
..
Kconfig [NET]: move config options out to individual protocols 2005-07-11 21:13:56 -07:00
Makefile [VLAN]: Use rtnl_link API 2007-07-10 22:15:03 -07:00
vlan.c [VLAN]: Update list address 2008-01-28 15:08:34 -08:00
vlan.h [VLAN]: checkpatch cleanups 2008-01-28 15:08:33 -08:00
vlan_dev.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 2008-03-18 00:37:55 -07:00
vlan_netlink.c [VLAN]: Turn VLAN_DEV_INFO into inline function 2008-01-28 15:08:32 -08:00
vlanproc.c net: replace remaining __FUNCTION__ occurrences 2008-03-05 20:47:47 -08:00
vlanproc.h [VLAN]: checkpatch cleanups 2008-01-28 15:08:33 -08:00