summary refs log tree commit diff
path: root/sound/sh
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-01-31 14:59:28 -0800
committerOlof Johansson <olof@lixom.net>2014-01-31 14:59:28 -0800
commit167eeb470057adb5e9a22281d2852edc91c70473 (patch)
tree1cd900f135b5d3c7160f0e18cbd01914d5f7e64d /sound/sh
parent3f7c73023f7e317b7704d9c1c80a57bd3cc91828 (diff)
parent19e61d41404fe4094c2d54943dbf883d9bbca864 (diff)
downloadlinux-167eeb470057adb5e9a22281d2852edc91c70473.tar.gz
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 <olof@lixom.net>
Diffstat (limited to 'sound/sh')
0 files changed, 0 insertions, 0 deletions