linux-next: manual merge of the dma-mapping tree with the libata tree

Hi all, Today's linux-next merge of the dma-mapping tree got a conflict in arch/arm/boot/dts/highbank.dts between commit 8996b89d6bc9 ("ata: add platform driver for Calxeda AHCI controller") from the libata tree and commit 33e4628cc333 ("ARM: highbank: add coherent DMA setup") from the dma-mapping

linux-next: manual merge of the dma-mapping tree with the libata tree

Hi all, Today's linux-next merge of the dma-mapping tree got a conflict in Documentation/devicetree/bindings/ata/ahci-platform.txt between commit 8996b89d6bc9 ("ata: add platform driver for Calxeda AHCI controller") from the tree and commit 33e4628cc333 ("ARM: highbank: add coherent DMA setup") f