From: Len Brown <len.brown@intel.com>
Date: Sun, 5 Apr 2009 05:39:26 +0000 (-0400)
Subject: Merge branch 'battery' into release
X-Git-Tag: v2.6.30-rc1~199^2~18
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3266d63c0684138f4900d4e5c6fbfab59e054afc;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'battery' into release
---

3266d63c0684138f4900d4e5c6fbfab59e054afc