Merge tag 'mmc-4.1-rc1' of git://git.linaro.org/people/ulf.hansson/mmc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 22 Apr 2015 16:29:08 +0000 (09:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 22 Apr 2015 16:29:08 +0000 (09:29 -0700)
commit5e6c94a999f67f120c6bbba71bbee840dfee6338
tree189cef18f11f007aed6ef53169f6deee87eb2e13
parent3cfe213756a5c208ab51816d51641bf49f2e67fd
parent96541bac0b4e62efa42e7900d9b32e6baa9a214c
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()