diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-06 06:31:15 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-06 06:31:15 -0800 |
| commit | ccb1cfcb964fa8a8acd58b7783b2e82d7ad7975b (patch) | |
| tree | c4a7df583d5c1428a53e7f3297c24b8767461f2f /arch/arm/mach-imx/mm-imx3.c | |
| parent | 4bddddf24b644fd884f20639a91871bcbf567974 (diff) | |
| parent | 86bc52ef4373be64867b56f3a9e30cbabf64e0dd (diff) | |
| download | blackbird-op-linux-ccb1cfcb964fa8a8acd58b7783b2e82d7ad7975b.tar.gz blackbird-op-linux-ccb1cfcb964fa8a8acd58b7783b2e82d7ad7975b.zip | |
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
Diffstat (limited to 'arch/arm/mach-imx/mm-imx3.c')
0 files changed, 0 insertions, 0 deletions
