Merge branch 'v3.10/topic/misc' into linux-linaro-lsk
authorAlex Shi <alex.shi@linaro.org>
Wed, 23 Jul 2014 07:02:32 +0000 (15:02 +0800)
committerAlex Shi <alex.shi@linaro.org>
Wed, 23 Jul 2014 07:02:32 +0000 (15:02 +0800)

Trivial merge