Merge branch 'imx/pinctrl' into next/pinctrl
authorOlof Johansson <olof@lixom.net>
Sat, 19 May 2012 15:00:41 +0000 (08:00 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 19 May 2012 15:00:41 +0000 (08:00 -0700)
commitf3f08dcb9965f42378851ce888fb7539607712e6
tree9fd6f0060757ca354c97d69a1719ba2f4d7c3953
parentcbd8d842319c8084c050292e7d167be2a4cf1ad9
parent3e48b1baa042a4d5e92f373fc945a4aa0081178b
Merge branch 'imx/pinctrl' into next/pinctrl

* imx/pinctrl:
  mtd: nand: gpmi: fix compile error caused by pinctrl call