Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorAlex Shi <alex.shi@linaro.org>
Wed, 17 Dec 2014 07:10:29 +0000 (15:10 +0800)
committerAlex Shi <alex.shi@linaro.org>
Wed, 17 Dec 2014 07:10:29 +0000 (15:10 +0800)

Trivial merge