Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorAlex Shi <alex.shi@linaro.org>
Mon, 9 Jun 2014 08:20:29 +0000 (16:20 +0800)
committerAlex Shi <alex.shi@linaro.org>
Mon, 9 Jun 2014 08:20:29 +0000 (16:20 +0800)

Trivial merge