Merge master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Jan 2006 20:22:17 +0000 (12:22 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Jan 2006 20:22:17 +0000 (12:22 -0800)

Trivial merge