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	ARM: dove: use fixed PCI i/o mapping	2012-07-26 09:10:00 -05:00
addr-map.c	ARM: dove: add explicit include of dove.h to addr-map.c	2012-03-06 21:34:42 -06:00
cm-a510.c	ARM: restart: dove: use new restart hook	2012-01-05 12:57:09 +00:00
common.c	Merge commit 'a849088aa1' from rmk/fixes into cleanup/io-pci	2012-09-04 15:01:37 +02:00
common.h	New feature development	2012-01-09 14:38:51 -08:00
dove-db-setup.c	ARM: Orion: SPI: Add clk/clkdev support.	2012-05-08 16:33:55 -07:00
irq.c	ARM: Orion: DT support for IRQ and GPIO Controllers	2012-07-27 16:48:14 +02:00
Kconfig	ARM: v6k: Dove platforms use V6K architecture CPUs	2011-02-02 21:23:27 +00:00
Makefile	[ARM] Dove: add support for multi-purpose pins configuration	2010-12-15 10:32:30 -05:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
mpp.c	Dove: Fix Section mismatch warnings	2012-05-14 18:13:15 +02:00
mpp.h	ARM: dove: Consolidate mpp code with platform mpp.	2011-05-16 15:49:31 -04:00
pcie.c	ARM: dove: use fixed PCI i/o mapping	2012-07-26 09:10:00 -05:00