tree b1151588bb4b355fe6956348435f2adb409aa3f2
parent 39cecf2091f10c3a5052d1e58da690d20852b243
parent 50b178512b7d6e7724f87459f6bd06504c9c2da1
author Len Brown <len.brown@intel.com> 1231490219 -0500
committer Len Brown <len.brown@intel.com> 1231490219 -0500

Merge branch 'battery' into release