diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-11-14 21:20:48 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-11-14 21:20:48 +0800 |
| commit | ce1155567237713034522d08c24a007c268c9ea2 (patch) | |
| tree | b906b7eb753be4f17db02dbc63cc8a3a75f7ea67 /net/ipv4/tcp_output.c | |
| parent | ecad39540a66997b642907e2f939a9f662471a9f (diff) | |
| parent | 602decea81c1d7e89cb633acb0e34fd74cd8a122 (diff) | |
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
Diffstat (limited to 'net/ipv4/tcp_output.c')
0 files changed, 0 insertions, 0 deletions