Merge commit 'e111b0c68b' from rmk/fixes into cleanup/io-pci

Merge commit 'e111b0c68b' from rmk/fixes into cleanup/io-pci

As Stephen Rothwell reports, e111b0c68bd0 ("ARM: Fix ioremap() of
address zero") from the arm-current tree and commit aa9d1d942ef6 ("ARM:
Add fixed PCI i/o mapping") from the arm-soc tree conflict in
a nontrivial way in arch/arm/mm/mmu.c.

Rob Herring explains:
The PCI i/o reserved area has a dummy physical address of 0 and
needs to be skipped by ioremap searches. So we don't set
VM_ARM_STATIC_MAPPING to prevent matches by ioremap. The vm_struct
settings don't really matter when we do the real mapping of the
i/o space.

Since commit e111b0c68bd0 is at the start of the fixes branch
in the arm tree, we can merge it into the branch that contains
the other ioremap changes.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>