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

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

91e52df3ad8b9c84c4f6f050e0f14127894dd8ce