From: Len Brown <len.brown@intel.com>
Date: Mon, 25 Oct 2010 06:12:57 +0000 (-0400)
Subject: Merge branch 'battery' into release
X-Git-Tag: firefly_0821_release~7613^2~3623^2~8
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=880308089d0abebac365c3a1378b4e3238b100ac;p=firefly-linux-kernel-4.4.55.git

Merge branch 'battery' into release
---

880308089d0abebac365c3a1378b4e3238b100ac