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: v3.1-rc1~16^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5389102e231d5f06da8b2897336293db18af9d76;p=users%2Fhch%2Fuuid.git

Merge branch 'battery' into release
---

5389102e231d5f06da8b2897336293db18af9d76