diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-02 16:21:59 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-02 16:21:59 +0200 |
| commit | 21b3ac76b1bd31ec22bd00fff7d0259c86b8b957 (patch) | |
| tree | 4400b2463726f921675b31f8c2ea4804dddca15f /arch/arm/mach-mxs/mm.c | |
| parent | 831bbbeb2b0341a82a464896be49493c104d78f0 (diff) | |
| parent | fc46d17c4a6b7aa2af11eb9275ed9791f2594ddf (diff) | |
Merge tag 'v3.9-rc1_cns3xxx_fixes' of git://git.infradead.org/users/cbou/linux-cns3xxx into next/fixes-non-critical
From Anton Vorontsov <anton@enomsg.org>:
This tag includes Mac Lin's work to revive CNS3xxx booting:
"Since commit 0536bdf33faf (ARM: move iotable mappings within the vmalloc
region), [...] the pre-defined iotable mappings is not in the vmalloc
region. [...] move the iotable mappings into the vmalloc region, and
merge the MPCore private memory region (containing the SCU, the GIC and
the TWD) as a single region."
Plus there is a small cosmetic fix, also from Mac Lin.
* tag 'v3.9-rc1_cns3xxx_fixes' of git://git.infradead.org/users/cbou/linux-cns3xxx:
ARM: cns3xxx: remove unused virtual address and iotable defines
ARM: cns3xxx: fix mapping of private memory region
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-mxs/mm.c')
0 files changed, 0 insertions, 0 deletions