From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Nov 2019 16:58:56 +0000 (-0800)
Subject: Merge tag 'mmc-v5.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
X-Git-Tag: v5.4-rc8~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5b675f7362ba9debfd6c3e38edda197b35a29f0f;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'mmc-v5.4-rc7' of git://git./linux/kernel/git/ulfh/mmc

Pull MMC fix from Ulf Hansson:
 "Don't overwrite quirk flags in sdhci-of-at91 host driver"

* tag 'mmc-v5.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: sdhci-of-at91: fix quirk2 overwrite
---

5b675f7362ba9debfd6c3e38edda197b35a29f0f