Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Linus Torvalds [Thu, 8 Sep 2005 22:55:23 +0000 (15:55 -0700)]

Trivial merge