From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 17 Feb 2018 18:08:28 +0000 (-0800)
Subject: Merge tag 'mmc-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
X-Git-Tag: microblaze-4.16-rc6~9
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=fa2139ef9c43030286debe532c65c35ef4551599;p=linux-2.6-microblaze.git

Merge tag 'mmc-v4.16-rc1' of git://git./linux/kernel/git/ulfh/mmc

Pull MMC fixes from Ulf Hansson:

 - meson-gx: Revert to earlier tuning process

 - bcm2835: Don't overwrite max frequency unconditionally

* tag 'mmc-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: bcm2835: Don't overwrite max frequency unconditionally
  Revert "mmc: meson-gx: include tx phase in the tuning process"
---

fa2139ef9c43030286debe532c65c35ef4551599