diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-18 14:40:17 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-18 14:40:17 -0700 |
| commit | e5c6cac6e3977d1add2f64a0b1c6565fa4c94429 (patch) | |
| tree | 872e23546621e37b419fe2e9b4a7ed923fb0e950 /.gitignore | |
| parent | 054388947ca926260248774819858ee2dbbc735d (diff) | |
| parent | 03e97220b99b8b691ea5b130b7b4c135c9662792 (diff) | |
| download | linux-e5c6cac6e3977d1add2f64a0b1c6565fa4c94429.tar.bz2 | |
Merge tag 'imx-fixes-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
Merge "ARM: imx: fixes for 3.16, 2nd take" from Shawn Guo:
The i.MX fixes for 3.16, 2nd take:
It fixes a hard machine hang regression for boards where only pcie is
active but no sata, as the latest imx6-pcie driver is no longer enabling
the upstream clock directly but only lvds clk out.
* tag 'imx-fixes-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: clk-imx6q: parent lvds_sel input from upstream clock gates
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions