Merge remote-tracking branch 'lsk/v3.10/topic/dma-mapping' into lsk-v3.10-arm64-misc
authorMark Brown <broonie@kernel.org>
Fri, 23 Jan 2015 20:27:25 +0000 (20:27 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 23 Jan 2015 20:27:25 +0000 (20:27 +0000)
1  2 
arch/arm/mm/dma-mapping.c

Simple merge