Merge tag 'mmc-v4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 Mar 2017 19:05:05 +0000 (12:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 Mar 2017 19:05:05 +0000 (12:05 -0700)
commit728f4b3aa6621aba12e9f9c2f006f2912a90463a
tree9bc11cbaa7276e4e9683122f77dab24a41b39e99
parent0fc04f911374594de1c6b50cde53f5802241e668
parentd0918764c17b94c30bbb2619929b1719ff52707a
Merge tag 'mmc-v4.11-rc4' of git://git./linux/kernel/git/ulfh/mmc

Pull MMC fixes from Ulf Hansson:
 "Here are a couple of mmc fixes intended for v4.11 rc5.

  MMC host:
   - sdhci: Fix bug when using SDIO IRQ
   - sdhci-of-at91: Fix eMMC DDR52 card detection"

* tag 'mmc-v4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: sdhci-of-at91: fix MMC_DDR_52 timing selection
  mmc: sdhci: Disable runtime pm when the sdio_irq is enabled