Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorAlex Shi <alex.shi@linaro.org>
Sun, 28 Sep 2014 09:26:52 +0000 (17:26 +0800)
committerAlex Shi <alex.shi@linaro.org>
Sun, 28 Sep 2014 09:26:52 +0000 (17:26 +0800)

Trivial merge