]> 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>
Wed, 26 Sep 2012 05:19:41 +0000 (15:19 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 05:19:41 +0000 (15:19 +1000)
commitb82b63309a8be96d269521c5e9e22ea08e138d96
treeeccdf33c4b28ebf37a53df3ccbe583c69131624c
parent93b395045c2a6118e22b4092a53a28ea2a9ad069
parent8aa8bee5828cbb2576bb030219d9681416edd1db
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