Merge branch 'v4.4/topic/hibernate' into linux-linaro-lsk-v4.4
authorAlex Shi <alex.shi@linaro.org>
Mon, 14 Nov 2016 13:20:48 +0000 (21:20 +0800)
committerAlex Shi <alex.shi@linaro.org>
Mon, 14 Nov 2016 13:20:48 +0000 (21:20 +0800)
commitce1155567237713034522d08c24a007c268c9ea2
treeb906b7eb753be4f17db02dbc63cc8a3a75f7ea67
parentecad39540a66997b642907e2f939a9f662471a9f
parent602decea81c1d7e89cb633acb0e34fd74cd8a122
Merge branch 'v4.4/topic/hibernate' into linux-linaro-lsk-v4.4

Conflicts:
conflicts are almost come from mm-kaslr, focus on mm
arch/arm64/include/asm/cpufeature.h
arch/arm64/include/asm/pgtable.h
arch/arm64/kernel/Makefile
arch/arm64/kernel/cpufeature.c
arch/arm64/kernel/head.S
arch/arm64/kernel/suspend.c
arch/arm64/kernel/vmlinux.lds.S
arch/arm64/kvm/hyp.S
arch/arm64/mm/init.c
arch/arm64/mm/mmu.c
arch/arm64/mm/proc-macros.S
17 files changed:
arch/arm/Kconfig
arch/arm/kvm/arm.c
arch/arm64/Kconfig
arch/arm64/include/asm/assembler.h
arch/arm64/include/asm/cpufeature.h
arch/arm64/include/asm/kvm_asm.h
arch/arm64/include/asm/kvm_host.h
arch/arm64/include/asm/memory.h
arch/arm64/include/asm/sysreg.h
arch/arm64/kernel/Makefile
arch/arm64/kernel/arm64ksyms.c
arch/arm64/kernel/cpufeature.c
arch/arm64/kernel/head.S
arch/arm64/kernel/setup.c
arch/arm64/kernel/sleep.S
arch/arm64/kernel/vmlinux.lds.S
arch/arm64/kvm/hyp.S