Merge remote-tracking branch 'dma-mapping/dma-mapping-next'

Conflicts:
	Documentation/devicetree/bindings/ata/ahci-platform.txt
	arch/arm/boot/dts/highbank.dts

diff --cc Documentation/devicetree/bindings/ata/ahci-platform.txt
index 147c1f6653fe78c3ee442290d38f4f436c670fb4,6c1ad01d27e8369f4716dc2f245ef49d5c8be42d..b519f9b699c30eec22d99b7398691b3b80c4c7a3
--- 1/Documentation/devicetree/bindings/ata/ahci-platform.txt
--- 2/Documentation/devicetree/bindings/ata/ahci-platform.txt
+++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt
@@@ -9,9 -9,7 +9,10 @@@ Required properties
  - reg               : <registers mapping>
  
  Optional properties:
 +- calxeda,port-phys: phandle-combophy and lane assignment, which maps each
 +                      SATA port to a combophy and a lane within that
 +                      combophy
+ - dma-coherent      : Present if dma operations are coherent
  
  Example:
          sata@ffe08000 {

diff --cc arch/arm/boot/dts/highbank.dts
index 5204cf73c2d81540459b4442fd675d596c8789e5,7414577c177fce867038a717b29cb3c3ea3545fe..0c6fc34821f93f336fd705626c35da8b9cbba9f3
--- 1/arch/arm/boot/dts/highbank.dts
--- 2/arch/arm/boot/dts/highbank.dts
+++ b/arch/arm/boot/dts/highbank.dts
@@@ -121,9 -121,7 +121,10 @@@
                        compatible = "calxeda,hb-ahci";
                        reg = <0xffe08000 0x10000>;
                        interrupts = <0 83 4>;
 +                      calxeda,port-phys = <&combophy5 0 &combophy0 0
 +                                           &combophy0 1 &combophy0 2
 +                                           &combophy0 3>;
+                       dma-coherent;
                };
  
                sdhci@ffe0e000 {

diff --cc arch/arm/include/asm/memory.h
Simple merge

diff --cc arch/arm/mm/mmu.c
Simple merge