Merge branch 'renesas-sh7372' into renesas-soc
authorRafael J. Wysocki <rjw@sisk.pl>
Wed, 11 Jul 2012 21:02:31 +0000 (23:02 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Wed, 11 Jul 2012 21:02:31 +0000 (23:02 +0200)
commit27748df5eeb4a3b5e5dd588a199852d4cfaec53d
treeb5c16b3b07229599988187b98ce340cf932104ea
parent0b14121f93e330a8231f6dafc1c6eaf888f3dbe6
parent911a472aca3dac8aede558760a85ae051966dda0
Merge branch 'renesas-sh7372' into renesas-soc

* renesas-sh7372:
  ARM: shmobile: Fix build problem in pm-sh7372.c for unusual .config
  ARM: shmobile: Take cpuidle dependencies into account correctly
  ARM: shmobile: sh7372: completely switch over to using pm-rmobile API
  ARM: shmobile: ap4evb: switch to using pm-rmobile API
  ARM: shmobile: mackerel: switch to using pm-rmobile API
  ARM: shmobile: sh7372: add pm-rmobile domain support
  ARM: shmobile: sh7372 A3SM CPUIdle support
  ARM: shmobile: Use INTCA with sh7372 A3SM power domain
  ARM: shmobile: use common DMAEngine definitions on sh7372
  ARM: shmobile: sh7372: remove unused sh7372_a3sp_init() on !CONFIG_PM
arch/arm/mach-shmobile/board-mackerel.c
arch/arm/mach-shmobile/setup-sh7372.c