Olof Johansson 0d601f613b Merge branch 'kirkwood/addr_decode' of git://git.infradead.org/users/jcooper/linux into late/kirkwood ... * 'kirkwood/addr_decode' of git://git.infradead.org/users/jcooper/linux: arm: mvebu: add address decoding controller to the DT arm: mvebu: add basic address decoding support to Armada 370/XP arm: plat-orion: make bridge_virt_base non-const to support DT use case arm: plat-orion: introduce PLAT_ORION_LEGACY hidden config option arm: plat-orion: use void __iomem pointers for addr-map functions arm: plat-orion: use void __iomem pointers for time functions arm: plat-orion: use void __iomem pointers for MPP functions arm: plat-orion: use void __iomem pointers for UART registration functions arm: mach-mvebu: use IOMEM() for base address definitions arm: mach-orion5x: use IOMEM() for base address definitions arm: mach-mv78xx0: use IOMEM() for base address definitions arm: mach-kirkwood: use IOMEM() for base address definitions arm: mach-dove: use IOMEM() for base address definitions arm: mach-orion5x: use plus instead of or for address definitions arm: mach-mv78xx0: use plus instead of or for address definitions arm: mach-kirkwood: use plus instead of or for address definitions arm: mach-dove: use plus instead of or for address definitions This branch had quite a few conflicts, in particular with the PCI static map rework from Rob Herring, and a few other context conflicts due to changes in Kconfig, etc. I fixed up conflicts in: arch/arm/Kconfig arch/arm/mach-dove/common.c arch/arm/mach-dove/include/mach/dove.h arch/arm/mach-kirkwood/common.c arch/arm/mach-kirkwood/include/mach/kirkwood.h arch/arm/mach-mv78xx0/common.c arch/arm/mach-mv78xx0/include/mach/mv78xx0.h arch/arm/mach-orion5x/common.c arch/arm/mach-orion5x/include/mach/orion5x.h Signed-off-by: Olof Johansson <olof@lixom.net>		2012-09-22 14:22:47 -07:00
..
include/plat	Merge branch 'kirkwood/addr_decode' of git://git.infradead.org/users/jcooper/linux into late/kirkwood	2012-09-22 14:22:47 -07:00
addr-map.c	arm: plat-orion: use void __iomem pointers for addr-map functions	2012-09-21 18:04:47 +00:00
common.c	Merge branch 'kirkwood/addr_decode' of git://git.infradead.org/users/jcooper/linux into late/kirkwood	2012-09-22 14:22:47 -07:00
gpio.c	ARM: orion: move custom gpio functions to orion-gpio.h	2012-09-14 09:21:59 -05:00
irq.c	ARM: orion: move custom gpio functions to orion-gpio.h	2012-09-14 09:21:59 -05:00
Makefile	arm: plat-orion: introduce PLAT_ORION_LEGACY hidden config option	2012-09-21 18:04:57 +00:00
mpp.c	Merge branch 'kirkwood/addr_decode' of git://git.infradead.org/users/jcooper/linux into late/kirkwood	2012-09-22 14:22:47 -07:00
pcie.c	ARM: Kirkwood: Replace clock gating	2012-05-08 16:34:04 -07:00
time.c	arm: plat-orion: use void __iomem pointers for time functions	2012-09-21 18:04:39 +00:00