Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
authorAlex Shi <alex.shi@linaro.org>
Thu, 17 Nov 2016 06:58:56 +0000 (14:58 +0800)
committerAlex Shi <alex.shi@linaro.org>
Thu, 17 Nov 2016 06:58:56 +0000 (14:58 +0800)

Trivial merge