/spare/repo/netdev-2.6 branch 'sis190'

author Jeff Garzik <jgarzik@pobox.com>

Mon, 29 Aug 2005 19:52:56 +0000 (15:52 -0400)

committer Jeff Garzik <jgarzik@pobox.com>

Mon, 29 Aug 2005 19:52:56 +0000 (15:52 -0400)
author Jeff Garzik <jgarzik@pobox.com>
Mon, 29 Aug 2005 19:52:56 +0000 (15:52 -0400)
committer Jeff Garzik <jgarzik@pobox.com>
Mon, 29 Aug 2005 19:52:56 +0000 (15:52 -0400)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/net/Kconfig
Simple merge
diff --cc drivers/net/Makefile
Simple merge
author	Jeff Garzik <jgarzik@pobox.com>
	Mon, 29 Aug 2005 19:52:56 +0000 (15:52 -0400)
committer	Jeff Garzik <jgarzik@pobox.com>
	Mon, 29 Aug 2005 19:52:56 +0000 (15:52 -0400)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history