]> 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>
Wed, 21 May 2014 06:03:39 +0000 (16:03 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 May 2014 06:03:39 +0000 (16:03 +1000)
1  2 
arch/arm/mm/dma-mapping.c

Simple merge