Merge tag 'renesas-soc3-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Thu, 22 Jan 2015 01:19:05 +0000 (17:19 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 22 Jan 2015 01:19:05 +0000 (17:19 -0800)
commitf50f7070e5de59a168e45831c1e667f04583f563
treed8116eb25aebc6f1ffd3fb043142252bf708c269
parenta71596933cf792dacc3c5080df298c0fccef1d94
parent1632ff162f305f38667632c465e4bfaab8ef87a2
Merge tag 'renesas-soc3-for-v3.20' of git://git./linux/kernel/git/horms/renesas into next/soc

Merge "Third Round of Renesas ARM Based SoC Updates for v3.20" from Simon
Horman:

* Special-case PM domains with memory-controllers

* tag 'renesas-soc3-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: R-Mobile: Special-case PM domains with memory-controllers
  ARM: shmobile: R-Mobile: Generalize adding/looking up special PM domains
  ARM: shmobile: R-Mobile: Consolidate rmobile_pd_suspend_*()

Signed-off-by: Olof Johansson <olof@lixom.net>