From: Olof Johansson Date: Fri, 23 Jan 2015 22:13:15 +0000 (-0800) Subject: Merge tag 'mvebu-soc-3.20-2' of git://git.infradead.org/linux-mvebu into next/soc X-Git-Tag: firefly_0821_release~176^2~2308^2~13 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8a333cc7bee2c8200e707681e8820d2de8a29946;p=firefly-linux-kernel-4.4.55.git Merge tag 'mvebu-soc-3.20-2' of git://git.infradead.org/linux-mvebu into next/soc Merge "mvebu/soc #2" from Andrew Lunn: Soc patches for mvebu for v3.20, part #2. * tag 'mvebu-soc-3.20-2' of git://git.infradead.org/linux-mvebu: bus: mvebu-mbus: make sure SDRAM CS for DMA don't overlap the MBus bridge window bus: mvebu-mbus: fix support of MBus window 13 on Armada XP/375/38x ARM: mvebu: use arm_coherent_dma_ops and re-enable hardware I/O coherency bus: mvebu-mbus: use automatic I/O synchronization barriers bus: mvebu-mbus: fix support of MBus window 13 ARM: mvebu: completely disable hardware I/O coherency Signed-off-by: Olof Johansson --- 8a333cc7bee2c8200e707681e8820d2de8a29946