Skip to content
Commit 0f51596b authored by Marek Szyprowski's avatar Marek Szyprowski
Browse files

Merge branch 'for-next-arm-dma' into for-linus 



Conflicts:
	arch/arm/Kconfig
	arch/arm/mm/dma-mapping.c

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
parents 61f6c7a4 4ce63fcd
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment