From: Olof Johansson Date: Sat, 19 May 2012 15:00:41 +0000 (-0700) Subject: Merge branch 'imx/pinctrl' into next/pinctrl X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f3f08dcb9965f42378851ce888fb7539607712e6;p=~shefty%2Frdma-dev.git Merge branch 'imx/pinctrl' into next/pinctrl * imx/pinctrl: mtd: nand: gpmi: fix compile error caused by pinctrl call --- f3f08dcb9965f42378851ce888fb7539607712e6