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)
commit0a32b0ba838f343d06db33b96ccc12859d0180e5
tree8774b2d0c36138163f7ea472773a506136126036
parentd831fd1b46d04e5c8c8a0431c321578d25852695
parentd49a5d426a7906927351ca58dd14c6870975b166
Merge branch 'thermal-framework' into linux-linaro-lsk