Arnd Bergmann 863e99a8c1 Merge commit 'a849088aa1' from rmk/fixes into cleanup/io-pci ... As Stephen Rothwell reports, a849088aa1 ("ARM: Fix ioremap() of address zero") from the arm-current tree and commit c279443709 ("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 a849088aa1 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>		2012-09-04 15:01:37 +02:00
..
cm.h	ARM: integrator: support CLCD RGB5551 layout for 16bpp	2011-02-19 11:08:41 +00:00
debug-macro.S	ARM: add an extra temp register to the low level debugging addruart macro	2011-09-26 10:11:25 -04:00
hardware.h	ARM: set vga memory base at run-time	2011-07-12 11:19:29 -05:00
impd1.h	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
irqs.h	ARM: 7389/2: plat-versatile: modernize FPGA IRQ controller	2012-05-04 16:53:37 +01:00
lm.h	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
memory.h	ARM: P2V: separate PHYS_OFFSET from platform definitions	2011-02-17 23:26:55 +00:00
platform.h	ARM: integrator: use fixed PCI i/o mapping	2012-07-26 09:09:57 -05:00
timex.h	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
uncompress.h	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00