diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-08-06 19:53:48 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-06 19:53:48 +0200 |
commit | 1b984fbe0f21711975f80667f7e8b240e7848fd7 (patch) | |
tree | 82309aada7533c925a10c2f9a522a807c761e9a6 /arch/arm/mach-ux500 | |
parent | Merge branch 'imx/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linu... (diff) | |
parent | ARM: mxs: always build ocotp (diff) | |
download | linux-1b984fbe0f21711975f80667f7e8b240e7848fd7.tar.xz linux-1b984fbe0f21711975f80667f7e8b240e7848fd7.zip |
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
Diffstat (limited to 'arch/arm/mach-ux500')
0 files changed, 0 insertions, 0 deletions