From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 9 May 2015 02:34:35 +0000 (-0700)
Subject: Merge tag 'mmc-4.1-rc2' of git://git.linaro.org/people/ulf.hansson/mmc
X-Git-Tag: Ubuntu-5.0.0-8.9~9419
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a8a0811314db714ae23ab9f0ea707711a076bf18;p=mirror_ubuntu-disco-kernel.git

Merge tag 'mmc-4.1-rc2' of git://git.linaro.org/people/ulf.hansson/mmc

Pull MMC fixes from Ulf Hansson:
 "MMC core:
   - Don't access RPMB partitions for normal read/write
   - Fix hibernation restore sequence

  MMC host:
   - dw_mmc: Fix card detection for non removable cards
   - dw_mmc: Fix sglist issue in 32-bit mode
   - sh_mmcif: Fix timeout value for command request"

* tag 'mmc-4.1-rc2' of git://git.linaro.org/people/ulf.hansson/mmc:
  mmc: dw_mmc: dw_mci_get_cd check MMC_CAP_NONREMOVABLE
  mmc: dw_mmc: init desc in dw_mci_idmac_init
  mmc: card: Don't access RPMB partitions for normal read/write
  mmc: sh_mmcif: Fix timeout value for command request
  mmc: core: add missing pm event in mmc_pm_notify to fix hib restore
---

a8a0811314db714ae23ab9f0ea707711a076bf18