Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorAlex Shi <alex.shi@linaro.org>
Wed, 15 Apr 2015 12:08:38 +0000 (20:08 +0800)
committerAlex Shi <alex.shi@linaro.org>
Wed, 15 Apr 2015 12:08:38 +0000 (20:08 +0800)

Trivial merge