]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'dma-mapping/dma-mapping-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 20 Sep 2012 06:40:46 +0000 (16:40 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 20 Sep 2012 06:40:46 +0000 (16:40 +1000)
commit032c237d2fd0b5fe0c21f9318d23ed1b8fc79f24
tree0c604b204d096a7c00b49ae7a602e1a892d0cf1f
parentfe65199e2c0935ce5f1a427075b4a29b021d5f6b
parent5306ea472252d4998a1315ff48df174480cc99fb
Merge remote-tracking branch 'dma-mapping/dma-mapping-next'

Conflicts:
Documentation/devicetree/bindings/ata/ahci-platform.txt
arch/arm/boot/dts/highbank.dts
Documentation/devicetree/bindings/ata/ahci-platform.txt
arch/arm/boot/dts/highbank.dts
arch/arm/include/asm/memory.h
arch/arm/mm/mmu.c