]> err.no Git - linux-2.6/commitdiff
Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 5 Nov 2005 20:39:24 +0000 (15:39 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 5 Nov 2005 20:39:24 +0000 (15:39 -0500)
1  2 
drivers/net/Kconfig
drivers/net/Makefile
include/linux/netdevice.h

Simple merge
Simple merge
Simple merge