From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 13 Jan 2015 02:25:23 +0000 (+1300)
Subject: Merge tag 'mmc-v3.19-3' of git://git.linaro.org/people/ulf.hansson/mmc
X-Git-Tag: firefly_0821_release~176^2~2528
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=904a9802cd4da43da092851851301c8d22918ccc;p=firefly-linux-kernel-4.4.55.git

Merge tag 'mmc-v3.19-3' of git://git.linaro.org/people/ulf.hansson/mmc

Pull MMC fixes from Ulf Hansson:
 "MMC host:
   - sdhci-pci|acpi: Support some new IDs
   - sdhci: Fix sleep from atomic context
   - sdhci-pxav3: Prevent hang during ->probe()
   - sdhci: Disable re-tuning for HS400"

* tag 'mmc-v3.19-3' of git://git.linaro.org/people/ulf.hansson/mmc:
  mmc: sdhci-pci: Add support for Intel SPT
  mmc: sdhci-acpi: Add ACPI HID INT344D
  mmc: sdhci: Fix sleep in atomic after inserting SD card
  mmc: sdhci-pxav3: do the mbus window configuration after enabling clocks
  mmc: sdhci: Disable re-tuning for HS400
  mmc: sdhci: Simplify use of tuning timer
  mmc: sdhci: Add out_unlock to sdhci_execute_tuning
  mmc: sdhci: Tuning should not change max_blk_count
---

904a9802cd4da43da092851851301c8d22918ccc