From: Len Brown <len.brown@intel.com>
Date: Sat, 6 Aug 2011 02:16:42 +0000 (-0400)
Subject: Merge branch 'battery' into release
X-Git-Tag: firefly_0821_release~3680^2~4708^2
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=5389102e231d5f06da8b2897336293db18af9d76;p=firefly-linux-kernel-4.4.55.git

Merge branch 'battery' into release
---

5389102e231d5f06da8b2897336293db18af9d76