Merge tag 'imx-fixes-3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawngu...
authorOlof Johansson <olof@lixom.net>
Wed, 27 Aug 2014 22:12:00 +0000 (15:12 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 27 Aug 2014 22:12:22 +0000 (15:12 -0700)
commite1e5b718436380042def7b3e22ac18c8f755fd4a
tree4f885c861c03d916bf9c4b01db0ecfd618b9934b
parentc2e1da63e6231d929f478b0bb5b44ad0bc59f646
parentbf8147208eab4a026558dcd686f76410de6c1643
Merge tag 'imx-fixes-3.17-2' of git://git./linux/kernel/git/shawnguo/linux into fixes

Merge "ARM: imx: fixes for 3.17, 2nd take" from Shawn Guo:

i.MX fixes for 3.17, 2nd take:
 - Fixes suspend/resume issue on imx53-qsrb due to PMIC IRQ pin
   configuration missing
 - A couple small SolidRun board fixes/correction from Rabeeh
   and Russell

* tag 'imx-fixes-3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: microsom-ar8035: MDIO pad must be set open drain
  ARM: dts: hummingboard/cubox-i: change SPDIF output to be more descriptive
  ARM: dts: hummingboard/cubox-i: add USB OC pinctrl configuration
  ARM: dts: imx53-qsrb: Fix suspend/resume

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