Merge master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 16:25:21 +0000 (09:25 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 16:25:21 +0000 (09:25 -0700)

Trivial merge