From: Olof Johansson Date: Fri, 31 Jan 2014 22:59:28 +0000 (-0800) Subject: Merge tag 'mvebu-fixes-3.13-2' of git://git.infradead.org/linux-mvebu into fixes X-Git-Tag: v3.14-rc1~7^2~9 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=167eeb470057adb5e9a22281d2852edc91c70473;p=linux.git Merge tag 'mvebu-fixes-3.13-2' of git://git.infradead.org/linux-mvebu into fixes mvebu fixes for v3.13 (incremental #2) - allow building and booting DT and non-DT plat-orion SoCs - catch proper return value for kirkwood_pm_init() - properly check return of of_iomap to solve boot hangs (mirabox, others) - remove a compile warning on Armada 370 with non-SMP. * tag 'mvebu-fixes-3.13-2' of git://git.infradead.org/linux-mvebu: ARM: mvebu: fix compilation warning on Armada 370 (i.e. non-SMP) ARM: mvebu: Fix kernel hang in mvebu_soc_id_init() when of_iomap failed ARM: kirkwood: kirkwood_pm_init() should return void ARM: orion: provide C-style interrupt handler for MULTI_IRQ_HANDLER Signed-off-by: Olof Johansson --- 167eeb470057adb5e9a22281d2852edc91c70473