Merge tag 'mmc-v4.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Sep 2017 17:41:02 +0000 (10:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 1 Sep 2017 17:41:02 +0000 (10:41 -0700)
commitd7e44b86a67fbf983fa6f2b9b2552e84c85589c0
tree92cb695b09a263c9e62091cbcfa0431fdfc5e700
parent381cce59a9d937d686f0b205fa2641499c81c6e6
parent99c14fc360dbbb583a03ab985551b12b5c5ca4f1
Merge tag 'mmc-v4.13-rc7' of git://git./linux/kernel/git/ulfh/mmc

Pull two more MMC fixes from Ulf Hansson:
 "MMC core:
   - Fix block status codes

  MMC host:
   - sdhci-xenon: Fix SD bus voltage select"

* tag 'mmc-v4.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: sdhci-xenon: add set_power callback
  mmc: block: Fix block status codes