projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c6e3324 dcad688)
Merge tag 'mvebu-fixes-3.19-6' of git://git.infradead.org/linux-mvebu into fixes
authorOlof Johansson <olof@lixom.net>
Wed, 28 Jan 2015 22:59:33 +0000 (14:59 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 28 Jan 2015 22:59:33 +0000 (14:59 -0800)
commit764e2c70eff2251e818537ac59f2365d0e4cf524
tree301d61cb559ce4d2baade87bfdc9c6e62c510338tree | snapshot
parentc6e3324e3b3e2516e8b698d0983c4c0f5a1293a8commit | diff
parentdcad68876c21bac709b01eda24e39d4410dc36a8commit | 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>
Unnamed repository; edit this file 'description' to name the repository.