Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Linus Torvalds [Mon, 31 Oct 2005 01:47:00 +0000 (17:47 -0800)]

Trivial merge