From: Olof Johansson Date: Fri, 3 Apr 2015 17:52:29 +0000 (-0700) Subject: Merge tag 'renesas-pm-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v4.1-rc1~52^2~3 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=c25a9fada42395b43ad332a208f328975471f38e;p=linux.git Merge tag 'renesas-pm-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup Merge "Renesas ARM Based SoC PM Updates for v4.1" from Simon Horman: * Consolidate the pm code for R-Car Gen2 * Correct SYSCIER value for r8a7790 and r8a7791 SoCs * tag 'renesas-pm-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Consolidate the pm code for R-Car Gen2 ARM: shmobile: r8a7791: Correct SYSCIER value ARM: shmobile: r8a7790: Correct SYSCIER value Signed-off-by: Olof Johansson --- c25a9fada42395b43ad332a208f328975471f38e