Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android
authorAlex Shi <alex.shi@linaro.org>
Thu, 21 May 2015 02:13:07 +0000 (10:13 +0800)
committerAlex Shi <alex.shi@linaro.org>
Thu, 21 May 2015 02:13:07 +0000 (10:13 +0800)

Trivial merge