Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorAlex Shi <alex.shi@linaro.org>
Thu, 19 Dec 2013 05:51:33 +0000 (13:51 +0800)
committerAlex Shi <alex.shi@linaro.org>
Thu, 19 Dec 2013 05:51:33 +0000 (13:51 +0800)

Trivial merge