Merge remote-tracking branch 'dma-public/for-v3.12-cma-dma' into for-next
Conflicts:
mm/Kconfig
Signed-off-by: NMarek Szyprowski <m.szyprowski@samsung.com>
Showing
想要评论请 注册 或 登录
Conflicts:
mm/Kconfig
Signed-off-by: NMarek Szyprowski <m.szyprowski@samsung.com>