Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Linus Torvalds authored
150a631f