Merge branches 'fixes-for-37', 'ec' and 'thermal' into release
authorLen Brown <len.brown@intel.com>
Tue, 9 Oct 2012 05:47:35 +0000 (01:47 -0400)
committerLen Brown <len.brown@intel.com>
Tue, 9 Oct 2012 05:47:35 +0000 (01:47 -0400)

Trivial merge