diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-02 16:08:43 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-02 16:09:45 +0200 |
| commit | 06d1d8c85700884940346f20d10b3a22c331b5e9 (patch) | |
| tree | 3eafff71062b81431fdd8c745ad9ea312b89ca2c /block/blk-ioc.c | |
| parent | 76a254f76487ee1e8d969ed89f2f87a25158dd70 (diff) | |
| parent | a3d9052c6296ad3398d3ad649c3c682c3e7ecfa6 (diff) | |
Merge tag 'v3.9-rc1_cns3xxx_fixes' of git://git.infradead.org/users/cbou/linux-cns3xxx into fixes
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: fix mapping of private memory region
[arnd: dropped the cosmetic fix from the merge as it is not needed for 3.9]
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'block/blk-ioc.c')
0 files changed, 0 insertions, 0 deletions