]> 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>
Mon, 17 Sep 2012 09:56:53 +0000 (19:56 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Sep 2012 09:56:53 +0000 (19:56 +1000)
commit688c6804df16a3c4774886c359848bcac06d9dcc
treeb8513a3a78954b27ed232778ac18b8a40b232013
parentc2a272b29038f3387718036b9fce07ee6fa9586f
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