Merge master.kernel.org:/home/rmk/linux-2.6-mmc
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 26 Apr 2006 22:45:27 +0000 (15:45 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 26 Apr 2006 22:45:27 +0000 (15:45 -0700)
commita82642fa190029a438c0d09edb0e5463a0fe9e1e
tree92919f355dbf3f401a5ad96359dd6a741cd24f6a
parent58f8236bed448273cd7f9ae02c09467853303484
parent3d63abe56be2147891b3438cb3bd37a9be72bda7
Merge master.kernel.org:/home/rmk/linux-2.6-mmc

* master.kernel.org:/home/rmk/linux-2.6-mmc:
  [MMC] pxamci: fix data timeout calculation