Merge remote-tracking branch 'lsk/v3.10/topic/dma-mapping' into linux-linaro-lsk
authorMark Brown <broonie@kernel.org>
Fri, 23 Jan 2015 01:32:22 +0000 (01:32 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 23 Jan 2015 01:32:22 +0000 (01:32 +0000)
commit6e24f851befffc9b048715d436144eae3a09c05d
treed6cda035653c05ed0bf0a1a45c33a513713f6de9
parente0d6b762315b382e8c0aa07631491f47de4cb72b
parentdd403c2d2cf5c25eb82310bfe70704c0ea8452b7
Merge remote-tracking branch 'lsk/v3.10/topic/dma-mapping' into linux-linaro-lsk
arch/arm/mm/dma-mapping.c
include/linux/genalloc.h
lib/genalloc.c