From: Len Brown <len.brown@intel.com>
Date: Fri, 9 Jan 2009 08:36:59 +0000 (-0500)
Subject: Merge branch 'battery' into release
X-Git-Tag: v2.6.29-rc1~34^2~8
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a8e896e2813316a2d3657dc07d5eef83c3b2d9f4;p=users%2Fhch%2Fxfs.git

Merge branch 'battery' into release
---

a8e896e2813316a2d3657dc07d5eef83c3b2d9f4