projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e87d10b d358c99)
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)
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>

Trivial merge