Merge branch 'mxs/gpmi' of git://git.linaro.org/people/shawnguo/linux-2.6 into next...
authorArnd Bergmann <arnd@arndb.de>
Tue, 28 Feb 2012 12:21:17 +0000 (12:21 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 28 Feb 2012 12:21:17 +0000 (12:21 +0000)
commitee80285e1b79e6a7a6855c8be65bddc61f4d69be
tree70816118e053fac5983c06c0416053140fc1e438
parentdae2efd750393565a90fa75eeab289dbeacc166e
parent60c15358f603ca21e791d2cc17029b620c625258
Merge branch 'mxs/gpmi' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/drivers

* 'mxs/gpmi' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: mxs: add GPMI-NAND support for imx23/imx28