Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android
authorAlex Shi <alex.shi@linaro.org>
Wed, 24 Jun 2015 05:13:32 +0000 (13:13 +0800)
committerAlex Shi <alex.shi@linaro.org>
Wed, 24 Jun 2015 05:13:32 +0000 (13:13 +0800)

Trivial merge