Merge master.kernel.org:/home/rmk/linux-2.6-mmc

This commit is contained in:
Linus Torvalds 2005-12-14 15:46:46 -08:00
commit 9d149c27eb