]> 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, 27 Sep 2012 06:07:11 +0000 (16:07 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 27 Sep 2012 06:07:11 +0000 (16:07 +1000)
commitec8de5a93ec2022fe206eefb64a5aafa86da4950
treeb3d606d16c1d1466be9fd9553119b5e205eae177
parent282b21a83a2e2071d2cae97f3fc698e0553ba822
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