Merge master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 5 Nov 2005 17:47:46 +0000 (09:47 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 5 Nov 2005 17:47:46 +0000 (09:47 -0800)

Trivial merge