Merge tag 'renesas-fixes5-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup

From Simon Horman:

* Correct incorrect placement of __initdata tag in ape6evm board code

* tag 'renesas-fixes5-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: ape6evm: fix incorrect placement of __initdata tag
  (+ other patches already present in v3.12-rc4)

Signed-off-by: Olof Johansson <olof@lixom.net>