Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorAlex Shi <alex.shi@linaro.org>
Mon, 26 May 2014 09:30:38 +0000 (17:30 +0800)
committerAlex Shi <alex.shi@linaro.org>
Mon, 26 May 2014 09:30:38 +0000 (17:30 +0800)

Trivial merge