From: Olof Johansson <olof@lixom.net>
Date: Sat, 19 May 2012 15:00:41 +0000 (-0700)
Subject: Merge branch 'imx/pinctrl' into next/pinctrl
X-Git-Tag: upstream/snapshot3+hdmi~7446^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f3f08dcb9965f42378851ce888fb7539607712e6;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'imx/pinctrl' into next/pinctrl

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

f3f08dcb9965f42378851ce888fb7539607712e6