Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-mmc.git
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 29 Aug 2005 17:35:21 +0000 (10:35 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 29 Aug 2005 17:35:21 +0000 (10:35 -0700)

Trivial merge