Merge tag 'renesas-soc3-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Sun, 13 Jul 2014 04:23:07 +0000 (21:23 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 13 Jul 2014 04:23:24 +0000 (21:23 -0700)
commit65d3977b6593d5506d711acb332d4bd09c986201
treec2d40590036203677c75708cc2529061b6830718
parente87d10b29f459e23964b14fe2300f808c5b6282e
parentd358c99838f3cf63ad7536124be4318cc84b11fa
Merge tag 'renesas-soc3-for-v3.17' of git://git./linux/kernel/git/horms/renesas into next/soc

Merge "Third Round of Renesas ARM Based SoC Updates for v3.17" from Simon
Horman:

- Correct build failure in APMU code in the case of !SUSPEND

* tag 'renesas-soc3-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: fix shmobile_smp_apmu_suspend_init build failure for !SUSPEND

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