Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
authorAlex Shi <alex.shi@linaro.org>
Fri, 8 Apr 2016 05:59:31 +0000 (13:59 +0800)
committerAlex Shi <alex.shi@linaro.org>
Fri, 8 Apr 2016 05:59:31 +0000 (13:59 +0800)

Trivial merge