tree 43f95e14b282cbc683ec66539de25e0e94649f65
parent 5a05e5bf204e729b79e9462785f2fa09d5126855
parent 6fe9febb8af2f82f9caace1aa1c00cd8de7469ac
author Linus Torvalds <torvalds@g5.osdl.org> 1157986598 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1157986598 -0700

Merge master.kernel.org:/home/rmk/linux-2.6-mmc

* master.kernel.org:/home/rmk/linux-2.6-mmc:
  [MMC] Always use a sector size of 512 bytes
  [MMC] Cleanup 385e3227d4d83ab13d7767c4bb3593b0256bf246
  [ARM] 3751/1: i.MX/MX1 SD/MMC use 512 bytes request for SCR read
  [MMC] Fix SD timeout calculation
  [MMC] constify mmc_host_ops