tree 82309aada7533c925a10c2f9a522a807c761e9a6
parent b29ee91c622ca50429012b9e2e3c87e434604c0f
parent 6eec0152c4aa43636e180b21d5c71743f25d1220
author Arnd Bergmann <arnd@arndb.de> 1344275628 +0200
committer Arnd Bergmann <arnd@arndb.de> 1344275628 +0200

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