-
由 Marek Szyprowski 提交于
Conflicts: arch/arm/Kconfig arch/arm/mm/dma-mapping.c Signed-off-by: NMarek Szyprowski <m.szyprowski@samsung.com>
0f51596b
Conflicts:
arch/arm/Kconfig
arch/arm/mm/dma-mapping.c
Signed-off-by: NMarek Szyprowski <m.szyprowski@samsung.com>