]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'dma-mapping/dma-mapping-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Sep 2012 05:49:47 +0000 (15:49 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Sep 2012 05:49:47 +0000 (15:49 +1000)
1  2 
arch/arm/include/asm/memory.h
arch/arm/mm/mmu.c

Simple merge
Simple merge