From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Nov 2016 18:51:18 +0000 (-0800)
Subject: Merge tag 'mmc-v4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
X-Git-Tag: v6.1~15388
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=16ae16c6e5616c084168740990fc508bda6655d4;p=sdk%2Femulator%2Femulator-kernel.git

Merge tag 'mmc-v4.9-rc5' of git://git./linux/kernel/git/ulfh/mmc

Pull MMC fixes from Ulf Hansson:
 "MMC host:

   - sdhci-of-esdhc: Fix card detection
   - dw_mmc: Fix DMA error path"

* tag 'mmc-v4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: dw_mmc: fix the error handling for dma operation
  mmc: sdhci-of-esdhc: fixup PRESENT_STATE read
---

16ae16c6e5616c084168740990fc508bda6655d4