From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 6 Aug 2012 17:53:48 +0000 (+0200)
Subject: Merge branch 'mxs/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2... 
X-Git-Tag: Ubuntu-5.13.0-19.19~24026^2~13
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=1b984fbe0f21711975f80667f7e8b240e7848fd7;p=mirror_ubuntu-jammy-kernel.git

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
---

1b984fbe0f21711975f80667f7e8b240e7848fd7