From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 1 Aug 2008 17:55:07 +0000 (-0700)
Subject: Merge git://git.infradead.org/battery-2.6
X-Git-Tag: v2.6.27-rc2~110
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=b14f7fb5aa2f4289e3a9fa8d7d92417ec8607498;p=linux-2.6-omap-h63xx.git

Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6:
  power_supply: Sharp SL-6000 (tosa) batteries support
  power_supply: fix up CHARGE_COUNTER output to be more precise
  power_supply: add CHARGE_COUNTER property and olpc_battery support for it
  power_supply: bump EC version check that we refuse to run with in olpc_battery
  power_supply: cleanup of the OLPC battery driver
  power_supply: add eeprom dump file to olpc_battery's sysfs
  power_supply: Support serial number in olpc_battery
---

b14f7fb5aa2f4289e3a9fa8d7d92417ec8607498