Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
authorAlex Shi <alex.shi@linaro.org>
Thu, 2 Jun 2016 02:25:31 +0000 (10:25 +0800)
committerAlex Shi <alex.shi@linaro.org>
Thu, 2 Jun 2016 02:25:31 +0000 (10:25 +0800)

Trivial merge