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)
* 'mxs/gpmi' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: mxs: add GPMI-NAND support for imx23/imx28


Trivial merge