From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 13 Dec 2011 04:06:13 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
X-Git-Tag: v3.2-rc6~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=71fe5ccac7ede00526de490a2df10ebcd39c4c11;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge branch 'for-linus' of git://git./linux/kernel/git/cjb/mmc

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
  mmc: core: Fix deadlock when the CONFIG_MMC_UNSAFE_RESUME is not defined
  mmc: sdhci-s3c: Remove old and misprototyped suspend operations
  mmc: tmio: fix clock gating on platforms with a .set_pwr() method
  mmc: sh_mmcif: fix clock gating on platforms with a .down_pwr() method
  mmc: core: Fix typo at mmc_card_sleep
  mmc: core: Fix power_off_notify during suspend
  mmc: core: Fix setting power notify state variable for non-eMMC
  mmc: core: Add quirk for long data read time
  mmc: Add module.h include to sdhci-cns3xxx.c
  mmc: mxcmmc: fix falling back to PIO
  mmc: omap_hsmmc: DMA unmap only once in case of MMC error
---

71fe5ccac7ede00526de490a2df10ebcd39c4c11