tree 70816118e053fac5983c06c0416053140fc1e438
parent dae2efd750393565a90fa75eeab289dbeacc166e
parent 60c15358f603ca21e791d2cc17029b620c625258
author Arnd Bergmann <arnd@arndb.de> 1330431677 +0000
committer Arnd Bergmann <arnd@arndb.de> 1330431677 +0000

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