From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 30 Oct 2017 09:43:07 +0000 (+0100)
Subject: Merge tag 'imx-defconfig-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawn... 
X-Git-Tag: v4.15-rc1~76^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a10276cf42536615755a8c4173e593192c5763f;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'imx-defconfig-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc

Pull "i.MX defconfig updates for 4.15" from Shawn Guo:
 - Turn on DRM_DW_HDMI_CEC option to get HDMI CEC support.
 - Enable MUX_MMIO to get ADV7180 probe on Gateworks GW51xx boards.

* tag 'imx-defconfig-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v6_v7_defconfig: Select the CEC driver
  ARM: imx_v6_v7_defconfig: Select CONFIG_MUX_MMIO
---

2a10276cf42536615755a8c4173e593192c5763f