Merge tag 'imx-fixes-4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawngu...
authorOlof Johansson <olof@lixom.net>
Tue, 3 Jul 2018 16:47:36 +0000 (09:47 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 3 Jul 2018 16:47:36 +0000 (09:47 -0700)
i.MX fixes for 4.18, round 2:
 - A couple of imx defconfig updates selecting USB ULPI support to fix
   a regression seen with USB driver, which is caused by commit
   03e6275ae381 ("usb: chipidea: Fix ULPI on imx51").
 - A fix on imx51-zii-rdu1 board touchscreen pinctrl setting, which
   causes an interrupt storm.

* tag 'imx-fixes-4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx_v4_v5_defconfig: Select ULPI support
  ARM: imx_v6_v7_defconfig: Select ULPI support
  ARM: dts: imx51-zii-rdu1: fix touchscreen pinctrl

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge