Merge master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 3 Feb 2006 23:51:13 +0000 (15:51 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 3 Feb 2006 23:51:13 +0000 (15:51 -0800)

Trivial merge