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
..
include/mach	Merge commit 'a849088aa1' from rmk/fixes into cleanup/io-pci	2012-09-04 15:01:37 +02:00
common.h	ARM: restart: integrator: use new restart hook	2012-01-05 12:57:13 +00:00
core.c	ARM: integrator: include <linux/export.h>	2012-08-09 15:16:44 +02:00
cpu.c	ARM: integrator: fix compile warning in cpu.c	2011-01-11 13:48:17 +00:00
impd1.c	ARM: 7371/1: integrator: factor out dynamic amba device allocator	2012-04-19 19:31:34 +01:00
integrator_ap.c	Merge commit 'a849088aa1' from rmk/fixes into cleanup/io-pci	2012-09-04 15:01:37 +02:00
integrator_cp.c	ARM: integrator: convert to common clock	2012-07-11 17:58:45 -07:00
Kconfig	ARM: 7310/1: integrator: implement sched_clock across all boards	2012-03-24 09:38:51 +00:00
leds.c	Disintegrate asm/system.h for ARM	2012-03-28 18:30:01 +01:00
lm.c	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
Makefile	ARM: Realview/Versatile/Integrator: separate out common clock code	2010-05-02 09:35:33 +01:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
pci_v3.c	ARM: integrator: remove trailing whitespace on pci_v3.c	2012-07-26 09:09:58 -05:00
pci.c	ARM: PCI: provide a default bus scan implementation	2012-05-13 17:12:17 +01:00