Merge tag 'mmc-v5.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Nov 2019 16:58:56 +0000 (08:58 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Nov 2019 16:58:56 +0000 (08:58 -0800)
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


Trivial merge