From: Olof Johansson Date: Wed, 28 Jan 2015 22:59:33 +0000 (-0800) Subject: Merge tag 'mvebu-fixes-3.19-6' of git://git.infradead.org/linux-mvebu into fixes X-Git-Tag: firefly_0821_release~176^2~2434^2~2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=764e2c70eff2251e818537ac59f2365d0e4cf524;p=firefly-linux-kernel-4.4.55.git 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 --- 764e2c70eff2251e818537ac59f2365d0e4cf524