]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas...
authorOlof Johansson <olof@lixom.net>
Tue, 6 Nov 2012 14:31:15 +0000 (06:31 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 6 Nov 2012 14:31:15 +0000 (06:31 -0800)
commitccb1cfcb964fa8a8acd58b7783b2e82d7ad7975b
treec4a7df583d5c1428a53e7f3297c24b8767461f2f
parent4bddddf24b644fd884f20639a91871bcbf567974
parent86bc52ef4373be64867b56f3a9e30cbabf64e0dd
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
arch/arm/mach-shmobile/clock-r8a7779.c