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

Trivial merge