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)
commit5b675f7362ba9debfd6c3e38edda197b35a29f0f
tree5a9eb11d3adc713b99d32cc528944b01922659d1
parent11ac7cc88b48130106c42c0dcaf8ba74fc9e7978
parentfed23c5829ecab4ddc712d7b0046e59610ca3ba4
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