From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 22 Apr 2015 16:29:08 +0000 (-0700)
Subject: Merge tag 'mmc-4.1-rc1' of git://git.linaro.org/people/ulf.hansson/mmc
X-Git-Tag: firefly_0821_release~176^2~1889
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=5e6c94a999f67f120c6bbba71bbee840dfee6338;p=firefly-linux-kernel-4.4.55.git

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

Pull MMC fixes from Ulf Hansson:
 "Here is two mmc core fixes for v.4.1 rc1:

   - fix error code propagation in mmc_pwrseq_simple_alloc()

   - revert 'mmc: core: Convert mmc_driver to device_driver'"

* tag 'mmc-4.1-rc1' of git://git.linaro.org/people/ulf.hansson/mmc:
  Revert "mmc: core: Convert mmc_driver to device_driver"
  mmc: pwrseq: Fix error code propagation in mmc_pwrseq_simple_alloc()
---

5e6c94a999f67f120c6bbba71bbee840dfee6338