Merge tag 'mmc-v4.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 Jan 2017 18:25:31 +0000 (10:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 Jan 2017 18:25:31 +0000 (10:25 -0800)
commitb84f02795e3bcf197ae13a7e3ac6cc9d66d2feaa
tree46adbd1ec56b86b4eac5cc21398469b669d3e3a5
parented4d50c42d67769138b49de7dc672b76c88ee1c8
parente9748e0364fe82dc037d22900ff13a62d04518bf
Merge tag 'mmc-v4.10-rc5' of git://git./linux/kernel/git/ulfh/mmc

Pull MMC fix from Ulf Hansson:
 "MMC host: fix runtime PM resume path in dw_mmc"

* tag 'mmc-v4.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: dw_mmc: force setup bus if active slots exist