Merge tag 'cleanup_for_v3.10' of git://git.infradead.org/users/jcooper/linux into next/cleanup

From Jason Cooper <jason@lakedaemon.net>:

mvebu cleanup for v3.10

 - plat-orion: prep for mvebu-mbus driver

* tag 'cleanup_for_v3.10' of git://git.infradead.org/users/jcooper/linux

:
  arm: mach-orion5x: use mv_mbus_dram_info() in PCI code
  arm: plat-orion: use mv_mbus_dram_info() in PCIe code
  arm: plat-orion: only build addr-map.c when needed

Signed-off-by: Arnd Bergmann <arnd@arndb.de>