Merge branch 'master'

author Jeff Garzik <jgarzik@pobox.com>

Fri, 28 Oct 2005 22:48:57 +0000 (18:48 -0400)

committer Jeff Garzik <jgarzik@pobox.com>

Fri, 28 Oct 2005 22:48:57 +0000 (18:48 -0400)
author Jeff Garzik <jgarzik@pobox.com>
Fri, 28 Oct 2005 22:48:57 +0000 (18:48 -0400)
committer Jeff Garzik <jgarzik@pobox.com>
Fri, 28 Oct 2005 22:48:57 +0000 (18:48 -0400)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/net/Kconfig
Simple merge
diff --cc drivers/net/smc91x.c
Simple merge
author	Jeff Garzik <jgarzik@pobox.com>
	Fri, 28 Oct 2005 22:48:57 +0000 (18:48 -0400)
committer	Jeff Garzik <jgarzik@pobox.com>
	Fri, 28 Oct 2005 22:48:57 +0000 (18:48 -0400)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/smc91x.c	patch \|	diff1 \|	diff2 \|	blob \| history