]> 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>
Fri, 24 Aug 2012 06:26:00 +0000 (16:26 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 24 Aug 2012 06:26:00 +0000 (16:26 +1000)
1  2 
arch/arm/Kconfig
arch/arm/mach-kirkwood/common.c
arch/arm/mm/mmu.c

Simple merge
Simple merge
Simple merge