Merge tag 'mmc-v4.14-rc4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Oct 2017 16:41:54 +0000 (09:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Oct 2017 16:41:54 +0000 (09:41 -0700)
commitdaea3daaf9d5606735a722677125fe860f86ff41
tree9c30e74e326bbab0183c6145fd03de30c216e91b
parent1960e8eabcba2749db9443adb2a5d93e4dabf590
parent48e1dc10a9440872c0fc07a7fbcfce177f996fd4
Merge tag 'mmc-v4.14-rc4-2' of git://git./linux/kernel/git/ulfh/mmc

Pull MMC fixes from Ulf Hansson:
 "A couple of MMC host fixes intended for v4.14-rc8:

   - renesas_sdhi: fix kernel panic
   - tmio: fix swiotlb buffer is full"

* tag 'mmc-v4.14-rc4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: renesas_sdhi: fix kernel panic in _internal_dmac.c
  mmc: tmio: fix swiotlb buffer is full