Merge branch 'lsk/topic/tc2' into linux-linaro-lsk
authorAlex Shi <alex.shi@linaro.org>
Wed, 4 Dec 2013 03:16:00 +0000 (11:16 +0800)
committerAlex Shi <alex.shi@linaro.org>
Wed, 4 Dec 2013 03:16:00 +0000 (11:16 +0800)
It was tested on lsk-test branch.


Trivial merge