From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 11 Sep 2006 14:56:38 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-mmc
X-Git-Tag: v2.6.18-rc7~9
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e004876c3b0b6a71406069b0e55368cb9bbdc920;p=linux-2.6

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
---

e004876c3b0b6a71406069b0e55368cb9bbdc920