Merge tag 'fixes-non-3.12' of git://git.infradead.org/linux-mvebu into next/fixes...
authorOlof Johansson <olof@lixom.net>
Sun, 4 Aug 2013 20:19:05 +0000 (13:19 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 4 Aug 2013 20:19:05 +0000 (13:19 -0700)
commit6a33fc8cacfc7fac829c72bd321868be7e72f609
treeca8572f214a30c4743b731b4ab2809a980b78369
parent3bd957978bb50390bb07678bc4c125989e9a81a2
parent2746a7c272a3242f919fa2fd5a5f2d9f8a41173a
Merge tag 'fixes-non-3.12' of git://git.infradead.org/linux-mvebu into next/fixes-non-critical

From Jason Cooper:
mvebu fixes-non-critical for v3.12

 - dove
    - fix section mismatch (all callers are already _init, so it's just a space
      issue)

* tag 'fixes-non-3.12' of git://git.infradead.org/linux-mvebu:
  ARM: dove: fix missing __init section of dove_mpp_gpio_mode
  + Linux 3.11-rc2

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/mach-shmobile/headsmp-scu.S
arch/arm/mach-shmobile/headsmp.S