Merge master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 15 Jan 2006 03:44:01 +0000 (19:44 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 15 Jan 2006 03:44:01 +0000 (19:44 -0800)

Trivial merge