diff options
| author | Olof Johansson <olof@lixom.net> | 2015-04-03 10:52:29 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-04-03 10:52:29 -0700 |
| commit | c25a9fada42395b43ad332a208f328975471f38e (patch) | |
| tree | 6cec803a23a4a65f1991de8fbeb050002ca51195 /arch/arm/mach-socfpga | |
| parent | 69f2a08047d0e5177f92835d8dc06d6d8b17fb93 (diff) | |
| parent | a8caad66904a7923c05fc4a137110085533ef00c (diff) | |
| download | op-kernel-dev-c25a9fada42395b43ad332a208f328975471f38e.zip op-kernel-dev-c25a9fada42395b43ad332a208f328975471f38e.tar.gz | |
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 <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-socfpga')
0 files changed, 0 insertions, 0 deletions
