Merge branch 'imx/pinctrl' into next/pinctrl

* imx/pinctrl:
  mtd: nand: gpmi: fix compile error caused by pinctrl call
This commit is contained in:
Olof Johansson 2012-05-19 08:00:41 -07:00
commit f3f08dcb99