Merge tag 'renesas-pm-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Fri, 3 Apr 2015 17:52:29 +0000 (10:52 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 3 Apr 2015 17:52:29 +0000 (10:52 -0700)
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 <olof@lixom.net>

Trivial merge