Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4
authorAlex Shi <alex.shi@linaro.org>
Mon, 12 Dec 2016 14:16:26 +0000 (22:16 +0800)
committerAlex Shi <alex.shi@linaro.org>
Mon, 12 Dec 2016 14:16:26 +0000 (22:16 +0800)
commita057484ab40ff81f22a94bb62c035c78b5abd940
tree770ed007ccc70bee7e533a7fe532dd8a774b1457
parent3ba1692e7239293d7bc5a596ca9b0707f5bc07d5
parentc95b7f1fab0c76882764a5196119237c8ad436ee
Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4

Conflicts:
also change cpu_enable_uao in arch/arm64/include/asm/processor.h
comment unmatch fixed in arch/arm64/kernel/suspend.c
arch/arm64/include/asm/cpufeature.h
arch/arm64/include/asm/processor.h
arch/arm64/kernel/cpufeature.c
arch/arm64/kernel/suspend.c
arch/arm64/mm/fault.c