Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorAlex Shi <alex.shi@linaro.org>
Thu, 27 Feb 2014 01:39:31 +0000 (09:39 +0800)
committerAlex Shi <alex.shi@linaro.org>
Thu, 27 Feb 2014 01:39:31 +0000 (09:39 +0800)

Trivial merge