From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 18 Mar 2013 14:46:44 +0000 (+0100)
Subject: Merge tag 'cleanup_for_v3.10' of git://git.infradead.org/users/jcooper/linux into... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=1a02bdffa61b47f422343c62d9bbf5708bc8772d;p=deliverable%2Flinux.git

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>
---

1a02bdffa61b47f422343c62d9bbf5708bc8772d