Merge branch 'v4.4/topic/optee-lsk-mainline' into linux-linaro-lsk-v4.4
authorAlex Shi <alex.shi@linaro.org>
Mon, 17 Jul 2017 14:17:03 +0000 (22:17 +0800)
committerAlex Shi <alex.shi@linaro.org>
Mon, 17 Jul 2017 14:17:03 +0000 (22:17 +0800)

Trivial merge