]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge git://git.infradead.org/battery-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 Feb 2008 04:13:05 +0000 (15:13 +1100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 Feb 2008 04:13:05 +0000 (15:13 +1100)
commitae9458d6a0956aa21cb49e1251e35a8d4dacbe6e
tree98c162c79113bc2bd748a3ad5b6fb5ba66139751
parent63e9b66e29357dd12e8b1d3ebf7036e7591f81e3
parente91926e9ea9073d8ce95b74602e8c2d775f5a793
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.
MAINTAINERS