Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Linus Torvalds [Thu, 8 Sep 2005 22:28:16 +0000 (15:28 -0700)]

Trivial merge