From: Olof Johansson Date: Sun, 13 Jul 2014 04:23:07 +0000 (-0700) Subject: Merge tag 'renesas-soc3-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v4.13~6884^2~26 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=65d3977b6593d5506d711acb332d4bd09c986201;p=mirror_ubuntu-bionic-kernel.git Merge tag 'renesas-soc3-for-v3.17' of git://git.kernel.org/pub/scm/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 --- 65d3977b6593d5506d711acb332d4bd09c986201