From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Jun 2012 19:48:07 +0000 (-0700)
Subject: Merge tag 'mmc-fixes-for-3.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.5-rc5~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=843760c58e7dc46a9325169ac72d27b3e2def426;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge tag 'mmc-fixes-for-3.5-rc5' of git://git./linux/kernel/git/cjb/mmc

Pull MMC fixes from Chris Ball:

 - omap_hsmmc: Using AUTO_CMD12 (enabled by default in 3.5-rc1) has
   been found to cause data corruption on the BeagleBoard, but no
   other OMAP boards so far.  Revert the patch until there's a root
   cause explanation that makes sense, at which point we might
   decide to use a blacklist or whitelist.

 - mmc_block: Fix incorrect data timeouts for the case of multiblock
   (ACMD22) writes for block-addressed cards.

* tag 'mmc-fixes-for-3.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
  Revert "mmc: omap_hsmmc: Enable Auto CMD12"
  mmc: block: fix the data timeout issue with ACMD22
---

843760c58e7dc46a9325169ac72d27b3e2def426