Merge branch 'eduardo-soc-thermal' into thermal-soc
authorZhang Rui <rui.zhang@intel.com>
Tue, 9 Dec 2014 03:38:34 +0000 (11:38 +0800)
committerZhang Rui <rui.zhang@intel.com>
Tue, 9 Dec 2014 03:38:34 +0000 (11:38 +0800)
commitc89d99546dc5b076ccd6692c48ada9a92820a4ac
tree30788930f8c3fca80c0e5d8a377786d4a4a863bd
parent5a530ff0d88a366736ae4d1021e7358b52e55756
parent9c1e4550b5cbe17ff68ce631356190ef9a565386
Merge branch 'eduardo-soc-thermal' into thermal-soc