From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Jan 2018 17:34:20 +0000 (-0800)
Subject: Merge tag 'mmc-v4.15-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f12e0dd0d7c7a82a66621d8e49fd9ecec0b18e19;p=linux.git

Merge tag 'mmc-v4.15-rc2-2' of git://git./linux/kernel/git/ulfh/mmc

Pull MMC host fixes from Ulf Hansson:

 - s3mci: mark debug_regs[] as static

 - renesas_sdhi: Add MODULE_LICENSE

* tag 'mmc-v4.15-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: s3mci: mark debug_regs[] as static
  mmc: renesas_sdhi: Add MODULE_LICENSE
---

f12e0dd0d7c7a82a66621d8e49fd9ecec0b18e19