From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Nov 2017 16:19:20 +0000 (-0700)
Subject: Merge tag 'mmc-v4.14-rc4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
X-Git-Tag: v4.14-rc8~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3f46540ee7015ad2e3665e68b0b22c48ce9f99e5;p=platform%2Fkernel%2Flinux-rpi3.git

Merge tag 'mmc-v4.14-rc4-3' of git://git./linux/kernel/git/ulfh/mmc

Pull MMC fixes from Ulf Hansson:
 "Fix dw_mmc request timeout issues"

* tag 'mmc-v4.14-rc4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: dw_mmc: Fix the DTO timeout calculation
  mmc: dw_mmc: Add locking to the CTO timer
  mmc: dw_mmc: Fix the CTO timeout calculation
  mmc: dw_mmc: cancel the CTO timer after a voltage switch
---

3f46540ee7015ad2e3665e68b0b22c48ce9f99e5