Merge branches 'release' and 'thermal' into release
commit160ff06b1848a01913611950b05963e3315f759b
authorLen Brown <len.brown@intel.com>
Thu, 13 Mar 2008 05:59:46 +0000 (13 01:59 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 13 Mar 2008 05:59:46 +0000 (13 01:59 -0400)
tree61afeb66a72116d3fdadb3f10feb05c8770c1f64
parent1ca721cdb748ba72c47e9c661d54696db3cde796
parent5e012760dfd5ec24c41b9eab9e654a88360bb026
Merge branches 'release' and 'thermal' into release