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

Trivial merge