Skip to content
Commit bf550fc9 authored by Alexander Graf's avatar Alexander Graf
Browse files

Merge remote-tracking branch 'origin/next' into kvm-ppc-next 

Conflicts:
	mm/Kconfig

CMA DMA split and ZSWAP introduction were conflicting, fix up manually.
parents 7e48c101 cc2df20c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment