Merge tag 'fixes-non-3.12' of git://git.infradead.org/linux-mvebu into next/fixes...

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>

diff --cc arch/arm/mach-shmobile/headsmp-scu.S
Simple merge

diff --cc arch/arm/mach-shmobile/headsmp.S
Simple merge