From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 2 Feb 2008 04:13:05 +0000 (+1100)
Subject: Merge git://git.infradead.org/battery-2.6
X-Git-Tag: v2.6.25-rc1~1071
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ae9458d6a0956aa21cb49e1251e35a8d4dacbe6e;p=linux-2.6-omap-h63xx.git

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

* git://git.infradead.org/battery-2.6:
  apm_power: check I.intval for zero value, we use it as the divisor
  MAINTAINERS: remove kernel-discuss@handhelds.org list
  pda_power: implement polling
  pda_power: various cleanups
  apm_power: support using VOLTAGE_* properties for apm calculations
  pda_power: add suspend/resume support
  power_supply: add few more values and props
  pda_power: only register available psu
  power: fix incorrect unregistration in power_supply_create_attrs error path
  power: remove POWER_SUPPLY_PROP_CAPACITY_LEVEL
  [BATTERY] power_supply_leds: use kasprintf
  [BATTERY] Every file should include the headers containing the prototypes for its global functions.
---

ae9458d6a0956aa21cb49e1251e35a8d4dacbe6e