| commit | 1a02bdffa61b47f422343c62d9bbf5708bc8772d | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Mar 18 15:46:44 2013 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon Mar 18 15:46:44 2013 +0100 |
| tree | 20ebd9257e5d42d8004cf0d4deb5bfcfb86b4abc | |
| parent | ef9c20ac96eda63734c59449f302b0ac5d418d09 [diff] | |
| parent | 3e762c86b337f6990cdbd71890921b4dd9351ed9 [diff] |
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>