Merge tag 'imx-defconfig-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawn...
authorArnd Bergmann <arnd@arndb.de>
Mon, 30 Oct 2017 09:43:07 +0000 (10:43 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 30 Oct 2017 09:43:07 +0000 (10:43 +0100)
commit2a10276cf42536615755a8c4173e593192c5763f
treec377a2961d14f818d6a21345320d282a3c5bbdde
parent5068d8710026f7db6ad36201fd650ae2f93144b3
parenta8ca183dc8c4e98980007ed8b8ccc7992cbad4ea
Merge tag 'imx-defconfig-4.15' of git://git./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