From: Olof Johansson Date: Tue, 6 Nov 2012 14:31:15 +0000 (-0800) Subject: Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas... X-Git-Tag: next-20121107~19^2~9^2~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ccb1cfcb964fa8a8acd58b7783b2e82d7ad7975b;p=karo-tx-linux.git Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc From Simon Horman: * 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r8a7740: Enable PMU ARM: mach-shmobile: add FLCTL DMA slave definitions for sh7372 ARM: shmobile: r8a7779: add I2C driver support ARM: shmobile: r8a7779: add I2C clock support ARM: shmobile: r8a7779: add HSPI clock support ARM: shmobile: r8a7740: fixup DT machine desc name typo ARM: shmobile: r8a7779: Replace modify_scu_cpu_psr with scu_power_mode ARM: shmobile: sh73a0: Replace modify_scu_cpu_psr with scu_power_mode ARM: shmobile: emev2: Replace modify_scu_cpu_psr with scu_power_mode ARM: shmobile: Remove SH7377 support ARM: shmobile: Remove SH7367 support --- ccb1cfcb964fa8a8acd58b7783b2e82d7ad7975b