commit | 160ff06b1848a01913611950b05963e3315f759b | [log] [tgz] |
---|---|---|
author | Len Brown <len.brown@intel.com> | Thu Mar 13 01:59:46 2008 -0400 |
committer | Len Brown <len.brown@intel.com> | Thu Mar 13 01:59:46 2008 -0400 |
tree | 61afeb66a72116d3fdadb3f10feb05c8770c1f64 | |
parent | 1ca721cdb748ba72c47e9c661d54696db3cde796 [diff] | |
parent | 5e012760dfd5ec24c41b9eab9e654a88360bb026 [diff] |
Merge branches 'release' and 'thermal' into release