Merge branches 'bugfix-battery', 'bugfix-misc', 'bugfix-rafael', 'bugfix-turbostat...
authorLen Brown <len.brown@intel.com>
Mon, 4 Jun 2012 04:48:41 +0000 (00:48 -0400)
committerLen Brown <len.brown@intel.com>
Mon, 4 Jun 2012 04:48:41 +0000 (00:48 -0400)
bug fixes

Signed-off-by: Len Brown <len.brown@intel.com>

Trivial merge