Merge tag 'amlogic-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/khilma...
authorArnd Bergmann <arnd@arndb.de>
Mon, 30 Oct 2017 09:58:30 +0000 (10:58 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 30 Oct 2017 09:58:30 +0000 (10:58 +0100)
commit0a02a25856cd05492c748aa15b7fa60941d524e3
treee627f0a0c1e23c7b532b513f655518766095b7bc
parent2a10276cf42536615755a8c4173e593192c5763f
parentfce107aea2cbea0d3bc6d170ba6ce14111661a1b
Merge tag 'amlogic-defconfig' of git://git./linux/kernel/git/khilman/linux-amlogic into next/soc

Pull "Amlogic: defconfig updates for v4.15" from Kevin Hilman:
- enable SDIO/MMC controller

* tag 'amlogic-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM: multi_v7_defconfig: enable the Meson MX SDIO/MMC controller
arch/arm/configs/multi_v7_defconfig