Skip to content
Snippets Groups Projects
Commit 21b3ac76 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v3.9-rc1_cns3xxx_fixes' of...

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 0536bdf3 (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: default avatarArnd Bergmann <arnd@arndb.de>
parents 831bbbeb fc46d17c
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment