From: Olof Johansson Date: Wed, 19 Apr 2017 13:35:07 +0000 (-0700) Subject: Merge tag 'imx-defconfig-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/shawn... X-Git-Tag: v4.14-rc1~951^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b0d40760da516f37ef24bf534325b010132c3ca1;p=platform%2Fkernel%2Flinux-rpi.git Merge tag 'imx-defconfig-4.12' of git://git./linux/kernel/git/shawnguo/linux into next/defconfig i.MX defconfig updates for 4.12: - Enable MAX11801 and HID_MULTITOUCH touch drivers. - Enable SMSC_PHY driver, as imx6sl-evk board has a LAN8720A ethernet phy supported by it. * tag 'imx-defconfig-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: imx_v6_v7_defconfig: Select SMSC_PHY ARM: imx_v6_v7_defconfig: Select hid-multitouchdriver ARM: imx_v6_v7_defconfig: Select max11801_ts touchscreen driver Signed-off-by: Olof Johansson --- b0d40760da516f37ef24bf534325b010132c3ca1