Merge branch 'thermal-framework' into linux-linaro-lsk
authorAlex Shi <alex.shi@linaro.org>
Fri, 4 Apr 2014 02:55:43 +0000 (10:55 +0800)
committerAlex Shi <alex.shi@linaro.org>
Fri, 4 Apr 2014 02:55:43 +0000 (10:55 +0800)
commitb31c69571f2d6dd7a4966517f11e87f0689bb0a8
tree438f78bb59cae3365c7594b381e17c5de32bbf79
parent920553ba25498d26fbc7de610cdcf2f74d470ba0
parent0e0eabed5b2cc7b0fe07f219a866c708b569f560
Merge branch 'thermal-framework' into linux-linaro-lsk

For card https://cards.linaro.org/browse/CARD-1213. This framework tested
under panda ES board with few DT patches backporting.