Merge master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 11 Sep 2005 16:16:03 +0000 (09:16 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 11 Sep 2005 16:16:03 +0000 (09:16 -0700)

Trivial merge