From: Len Brown <len.brown@intel.com>
Date: Sat, 19 Sep 2009 05:56:17 +0000 (-0400)
Subject: Merge branch 'battery' into release
X-Git-Tag: v2.6.32-rc1~171^2~13
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=7a92d803227a523a9a5546e4e0dce1325a4b5926;p=linux.git

Merge branch 'battery' into release
---

7a92d803227a523a9a5546e4e0dce1325a4b5926