]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'dma-mapping/dma-mapping-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Sep 2012 06:59:59 +0000 (16:59 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Sep 2012 06:59:59 +0000 (16:59 +1000)
1  2 
arch/arm/include/asm/memory.h
arch/arm/mm/mmu.c

Simple merge
Simple merge