]> 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>
Wed, 20 Feb 2013 05:22:54 +0000 (16:22 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 05:22:54 +0000 (16:22 +1100)
1  2 
arch/arm/Kconfig
arch/arm/mm/dma-mapping.c

Simple merge
Simple merge