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)
commit3bee1970b32d0c9d1ce986df4b4b58e5e8185c80
treefd6ee0ef8e78510fe15a239a7cae986958fd706e
parentdb96d5853e7d55f1d469d51a93ab38ce3bd72daa
parent24835611a96e9b41ad57dd5024915106293be7e9
Merge tag 'mmc-v4.12-rc5' of git://git./linux/kernel/git/ulfh/mmc

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