Merge master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 29 Dec 2005 18:27:28 +0000 (10:27 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 29 Dec 2005 18:27:28 +0000 (10:27 -0800)

Trivial merge