Merge master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 14 Dec 2005 23:46:46 +0000 (15:46 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 14 Dec 2005 23:46:46 +0000 (15:46 -0800)

Trivial merge