]> 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, 19 Sep 2012 05:06:08 +0000 (15:06 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 05:06:08 +0000 (15:06 +1000)
commitf7a3407b1d6aec0367c8c3e8ab8ea097c63663ff
treed179f2dfe6ad9b613d0e909966d614d268aa55ed
parenta4c0aa60283f342f12008ebf142ec0296762e174
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