Merge remote-tracking branch 'lsk/v3.10/topic/dma-mapping' into linux-linaro-lsk

diff --cc arch/arm/mm/dma-mapping.c
Simple merge

diff --cc include/linux/genalloc.h
Simple merge

diff --cc lib/genalloc.c
Simple merge