Merge branch 'mxs/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2...
authorArnd Bergmann <arnd@arndb.de>
Mon, 6 Aug 2012 17:53:48 +0000 (19:53 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 6 Aug 2012 17:53:48 +0000 (19:53 +0200)
commit1b984fbe0f21711975f80667f7e8b240e7848fd7
tree82309aada7533c925a10c2f9a522a807c761e9a6
parentb29ee91c622ca50429012b9e2e3c87e434604c0f
parent6eec0152c4aa43636e180b21d5c71743f25d1220
Merge branch 'mxs/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes

* 'mxs/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: mxs: always build ocotp
  ARM: mxs: Remove MMAP_MIN_ADDR setting from mxs_defconfig
  ARM: mx28: Fix registers range
  ARM: mx23: Fix registers range