Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Linus Torvalds [Mon, 5 Sep 2005 07:18:09 +0000 (00:18 -0700)]

Trivial merge