Merge tag 'mmc-v4.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jun 2017 08:49:52 +0000 (17:49 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jun 2017 08:49:52 +0000 (17:49 +0900)
Pull MMC fix from Ulf Hansson:
 "MMC meson-gx host: work around broken SDIO with certain WiFi chips"

* tag 'mmc-v4.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: meson-gx: work around broken SDIO with certain WiFi chips


Trivial merge