Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
authorAlex Shi <alex.shi@linaro.org>
Sat, 1 Apr 2017 03:15:12 +0000 (11:15 +0800)
committerAlex Shi <alex.shi@linaro.org>
Sat, 1 Apr 2017 03:15:12 +0000 (11:15 +0800)

Trivial merge