diff options
| author | Olof Johansson <olof@lixom.net> | 2013-11-11 09:39:37 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-11-11 09:39:37 -0800 |
| commit | 004f47bcadd61345306c74404999bd6ee16e22e1 (patch) | |
| tree | 777f2a418315177e101f7061a1f70f5e844407b8 /lib/test_module.c | |
| parent | 4d7e8061b7dbc327d19e2dd9687e41719d03403e (diff) | |
| parent | 036e29918078e38b0b127b89deb4c595028c1bc0 (diff) | |
Merge tag 'imx-fixes-3.13' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
From Shawn Guo, imx fixes for 3.13:
- A couple of imx5 and imx6 clock fixes
- Two follow-up patches for improving/fixing the commit "ARM: imx:
replace imx6q_restart()with mxc_restart()"
- One compile fix for imx6sl with randconfig
- Commits to fix pllv3 relock/power issues found in IPU/HDMI testing
* tag 'imx-fixes-3.13' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: dts: i.MX51: Fix OTG PHY clock
ARM: imx: set up pllv3 POWER and BYPASS sequentially
ARM: imx: pllv3 needs relock in .set_rate() call
ARM: imx: add sleep for pllv3 relock
ARM: imx6q: add missing sentinel to divider table
ARM: imx: v7_cpu_resume() is needed by imx6sl build
ARM: imx: improve mxc_restart() on the SRC bit writes
ARM: imx: remove imx_src_prepare_restart() call
ARM: i.MX6q: fix the wrong parent of can_root clock
Diffstat (limited to 'lib/test_module.c')
0 files changed, 0 insertions, 0 deletions