Merge branch 'master' into upstream

author Jeff Garzik <jeff@garzik.org>

Thu, 8 Jun 2006 19:24:46 +0000 (15:24 -0400)

committer Jeff Garzik <jeff@garzik.org>

Thu, 8 Jun 2006 19:24:46 +0000 (15:24 -0400)
author Jeff Garzik <jeff@garzik.org>
Thu, 8 Jun 2006 19:24:46 +0000 (15:24 -0400)
committer Jeff Garzik <jeff@garzik.org>
Thu, 8 Jun 2006 19:24:46 +0000 (15:24 -0400)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/net/forcedeth.c
Simple merge
diff --cc include/linux/pci_ids.h
Simple merge
author	Jeff Garzik <jeff@garzik.org>
	Thu, 8 Jun 2006 19:24:46 +0000 (15:24 -0400)
committer	Jeff Garzik <jeff@garzik.org>
	Thu, 8 Jun 2006 19:24:46 +0000 (15:24 -0400)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/forcedeth.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/pci_ids.h	patch \|	diff1 \|	diff2 \|	blob \| history