]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'dma-mapping/dma-mapping-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 06:24:41 +0000 (16:24 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 06:24:41 +0000 (16:24 +1000)
commit8f554a9c2a08fd426a0624047e0397de3b3f51b1
treed6c129658817ad914d63226bd9959c74b1f16de3
parent86712a7bc729dfd92ef30e251a81fdeda637b26b
parent461b6f0d3d7d4e556035463b531136b034b7433e
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/mach-highbank/highbank.c
arch/arm/mm/mmu.c