]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
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)
* imx/pinctrl:
  mtd: nand: gpmi: fix compile error caused by pinctrl call


Trivial merge