Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorAlex Shi <alex.shi@linaro.org>
Tue, 2 Sep 2014 04:10:33 +0000 (12:10 +0800)
committerAlex Shi <alex.shi@linaro.org>
Tue, 2 Sep 2014 04:10:33 +0000 (12:10 +0800)

Trivial merge