Merge branch 'thermal-framework' into linux-linaro-lsk
authorAlex Shi <alex.shi@linaro.org>
Sun, 28 Sep 2014 09:20:46 +0000 (17:20 +0800)
committerAlex Shi <alex.shi@linaro.org>
Sun, 28 Sep 2014 09:20:46 +0000 (17:20 +0800)

Trivial merge