Merge of master.kernel.org:/home/rmk/linux-2.6-mmc.git
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 21 May 2005 22:27:09 +0000 (15:27 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 21 May 2005 22:27:09 +0000 (15:27 -0700)

Trivial merge