Merge branch 'v4.4/topic/hibernate' into linux-linaro-lsk-v4.4
authorAlex Shi <alex.shi@linaro.org>
Thu, 17 Nov 2016 06:14:11 +0000 (14:14 +0800)
committerAlex Shi <alex.shi@linaro.org>
Thu, 17 Nov 2016 06:14:11 +0000 (14:14 +0800)
commit03263ac9903481c204624cf2ed2fbbc8a1150a3a
tree16e272faf0dcc716406a197191e5fb56924e6085
parent29703588215bbf281aed9aa8cdec0641757fb9e1
parent6917fd7ba6367512d24784ba24ff419c6d353f22
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
arch/arm64/include/asm/kvm_asm.h