From: Arnd Bergmann Date: Thu, 19 Jul 2012 21:17:12 +0000 (+0200) Subject: Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas... X-Git-Tag: v3.6-rc1~64^2~2 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6217a69a1e38807b3046b4fd6e4bf413e0e03b67;p=linux-block.git Merge branch 'soc' of git://git./linux/kernel/git/rafael/renesas into late/soc updates for Renesas ARM-based SoCs for v3.6. Included are: * Updates for the r8a7740, sh73a0 and sh7372 SoCs from Kuninori Morimoto. * Low-level power management code reorganization from Kuninori Morimoto. * Wakeup signaling rework for sh7372 and DT support bits for r8a7740 and sh7377 from Magnus Damm. * Assorted fixes. This branch also includes fixes based on top of v3.5-rc3 that have been already merged into arm-soc and mainline, which are not listed below. * 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas: (43 commits) ARM: shmobile: Fix build problem in pm-sh7372.c for unusual .config ARM: shmobile: Take cpuidle dependencies into account correctly ARM: mach-shmobile: sh7377 generic board support via DT ARM: mach-shmobile: r8a7740 generic board support via DT 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: r8a7740: add A4LC pm domain support ARM: shmobile: r8a7740: add A3SP pm domain support ARM: shmobile: r8a7740: add A4S pm domain support ARM: shmobile: r8a7740: fixup: MSEL1CR 7bit control ARM: shmobile: soc-core: add R-mobile PM domain common APIs ARM: shmobile: sh7372 A3SM CPUIdle support ARM: shmobile: Use INTCA with sh7372 A3SM power domain ARM: mach-shmobile: Convert sh_clk_mstp32_register to sh_clk_mstp_register ARM: shmobile: use common DMAEngine definitions on sh7372 ARM: shmobile: use common DMAEngine definitions on sh73a0 ARM: shmobile: sh73a0: add DMAEngine support for MPDMAC ARM: shmobile: sh73a0: add USB clock support ... Signed-off-by: Arnd Bergmann --- 6217a69a1e38807b3046b4fd6e4bf413e0e03b67