From: Alex Shi <alex.shi@linaro.org>
Date: Thu, 6 Jul 2017 03:12:46 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/v4.4/topic/optee-lsk-mainline' into linux-linaro... 
X-Git-Tag: release-20171130_firefly~4^2~100^2~1^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=03a929fbcbb1f7dca3cca19eefcbc15ecc191331;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'origin/v4.4/topic/optee-lsk-mainline' into linux-linaro-lsk-v4.4

Conflicts:
	compatiable issues in
	arch/arm64/kernel/arm64ksyms.c
	arch/arm64/kernel/asm-offsets.c
	arch/arm64/kvm/hyp/fpsimd.S
	drivers/firmware/psci.c
---

03a929fbcbb1f7dca3cca19eefcbc15ecc191331