Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorAlex Shi <alex.shi@linaro.org>
Tue, 14 Jan 2014 10:10:43 +0000 (18:10 +0800)
committerAlex Shi <alex.shi@linaro.org>
Tue, 14 Jan 2014 10:10:43 +0000 (18:10 +0800)

Trivial merge