Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
Linus Torvalds [Mon, 7 Nov 2005 00:58:38 +0000 (16:58 -0800)]

Trivial merge