| commit | 764e2c70eff2251e818537ac59f2365d0e4cf524 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Wed Jan 28 14:59:33 2015 -0800 |
| committer | Olof Johansson <olof@lixom.net> | Wed Jan 28 14:59:33 2015 -0800 |
| tree | 301d61cb559ce4d2baade87bfdc9c6e62c510338 | |
| parent | c6e3324e3b3e2516e8b698d0983c4c0f5a1293a8 [diff] | |
| parent | dcad68876c21bac709b01eda24e39d4410dc36a8 [diff] |
Merge tag 'mvebu-fixes-3.19-6' of git://git.infradead.org/linux-mvebu into fixes Merge "mvebu-fixes-6" from Andrew Lunn: The previous fix for Armada XP, disabling I/O coherency, broke Armada 375/38x. Only switch the PL310 to I/O coherent mode if I/O coherency is enabled. * tag 'mvebu-fixes-3.19-6' of git://git.infradead.org/linux-mvebu: ARM: mvebu: don't set the PL310 in I/O coherency mode when I/O coherency is disabled Signed-off-by: Olof Johansson <olof@lixom.net>