diff options
| author | Olof Johansson <olof@lixom.net> | 2013-05-20 23:45:42 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-05-20 23:46:46 -0700 |
| commit | a706d8505cce60f6088dbfa33ff075489e89f08d (patch) | |
| tree | 79d4ce081523e22f3b712f6ceb0f5b8981476dee /arch/parisc/kernel/irq.c | |
| parent | 7a7e3472dc7da062d0568fe7b120abd0c98ec9a9 (diff) | |
| parent | de78a23d73ba7f1d08f3e1aeaa0a03cb912c62a0 (diff) | |
Merge tag 'imx-fixes-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
From Shawn Guo, imx fixes for 3.10:
- A few imx6 clock fixes. Nothing is extremely important, but since
we're still in early -rc, I send them for 3.10 inclusion.
- Having bootloader handle ARM errata, we will need to replicate the
diagnostic register of boot cpu into secondary cores, since
bootloader only sets up boot cpu. Otherwise, errata workaround simply
does not work.
* tag 'imx-fixes-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: imx: fix typo in gpu3d_shader_sels
ARM: imx: replicate the diagnostic register of boot cpu into secondary cores
ARM i.MX6: correct MLB clock configuration
ARM i.MX6q: Fix periph_clk2_sel and periph2_clk2_sel clocks
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/parisc/kernel/irq.c')
0 files changed, 0 insertions, 0 deletions