Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03263ac9 authored by Alex Shi's avatar Alex Shi
Browse files

Merge branch 'v4.4/topic/hibernate' into linux-linaro-lsk-v4.4 

Conflicts:
	arch/arm64/include/asm/kvm_asm.h
	arch/arm64/include/asm/memory.h
	arch/arm64/kernel/head.S
	arch/arm64/kvm/hyp.S
parents 29703588 6917fd7b
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment