David S. Miller 8e8e43843b Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/usb/rndis_host.c drivers/net/wireless/b43/dma.c net/ipv6/ndisc.c		2008-03-27 18:48:56 -07:00
..
Kconfig
Makefile
vlan_dev.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2008-03-27 18:48:56 -07:00
vlan_netlink.c
vlan.c	[VLAN]: Reduce memory consumed by vlan_groups	2008-03-26 16:27:22 -07:00
vlan.h
vlanproc.c
vlanproc.h