| commit | 11cbb42a86895b88ac906a6768c998f9e98a37e2 | [log] [tgz] |
|---|---|---|
| author | Alex Shi <alex.shi@linaro.org> | Fri Apr 07 16:50:41 2017 +0800 |
| committer | Alex Shi <alex.shi@linaro.org> | Fri Apr 07 16:50:41 2017 +0800 |
| tree | 3eaeec2cff4c7e34add793c77079cdc85b058bb8 | |
| parent | 95ffb43f1ba759fb1205a8ce38a7ea5bab6be02d [diff] | |
| parent | 95bcc3e563748f65c9fc0eb1bbc3f99b76efd4b2 [diff] |
Merge remote-tracking branch 'origin/v4.4/topic/hibernate' into hikey-mainline-rebase-4.4 Conflicts: arch/arm64/Makefile arch/arm64/kernel/arm64ksyms.c arch/arm64/kernel/asm-offsets.c arch/arm64/kvm/hyp/fpsimd.S drivers/firmware/psci.c fs/proc/task_mmu.c mm/memcontrol.c