Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
authorAlex Shi <alex.shi@linaro.org>
Mon, 15 May 2017 09:36:26 +0000 (17:36 +0800)
committerAlex Shi <alex.shi@linaro.org>
Mon, 15 May 2017 09:36:26 +0000 (17:36 +0800)

Trivial merge