Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
authorAlex Shi <alex.shi@linaro.org>
Sat, 24 Sep 2016 10:14:52 +0000 (18:14 +0800)
committerAlex Shi <alex.shi@linaro.org>
Sat, 24 Sep 2016 10:14:52 +0000 (18:14 +0800)

Trivial merge