Merge branch 'cleanup/__iomem' into next/cleanup2
authorArnd Bergmann <arnd@arndb.de>
Fri, 28 Sep 2012 20:07:14 +0000 (22:07 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 28 Sep 2012 20:07:14 +0000 (22:07 +0200)
commitb98138e00d96abc85b100c9b6886f105d9868ab5
tree407c24077573368925ede8ff8309d67ea84e9981
parent0b40b4b44378f18b3c76384fa1380c24b5cd0f52
parentac3524b7f5a6b9a744fb7ea19991355354c09afb
Merge branch 'cleanup/__iomem' into next/cleanup2

* cleanup/__iomem:
  ARM: Orion5x: ts78xx: Add IOMEM for virtual addresses.
  ARM: ux500: use __iomem pointers for MMIO

Two new cleanup patches that were not already part of the
first cleanup branch.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/mach-shmobile/board-armadillo800eva.c
arch/arm/mach-shmobile/board-mackerel.c
arch/arm/mach-shmobile/intc-sh73a0.c