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

Conflicts:

	drivers/net/s2io.c

2008-04-02 22:35:23 -07:00

..

Kconfig

…

Makefile

[VLAN]: Use rtnl_link API

2007-07-10 22:15:03 -07:00

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]: Turn VLAN_DEV_INFO into inline function

2008-01-28 15:08:32 -08:00

vlan.c

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

2008-04-02 22:35:23 -07:00

vlan.h

[VLAN]: Proc entry is not renamed when vlan device name changes.

2008-04-02 00:08:01 -07:00

vlanproc.c

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

2008-04-02 22:35:23 -07:00

vlanproc.h

[VLAN]: checkpatch cleanups

2008-01-28 15:08:33 -08:00