Merge master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Jan 2006 20:22:17 +0000 (12:22 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Jan 2006 20:22:17 +0000 (12:22 -0800)
commita2b421fee37d34c09bd2a14d3e9294f838c64370
tree2fa074f1e80f7f46ddcc7503c9834009b6b845f7
parentba027def7be0d6494b72603d5758acc0fb1c7514
parenta621aaed690b9439141c555941b6af53873f6ff1
Merge master.kernel.org:/home/rmk/linux-2.6-mmc