diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 10:11:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 10:11:08 -0700 |
| commit | 433c24ed7ff378b22c4d6531a4ce1ffc62642395 (patch) | |
| tree | d71181129b05d923100d160ca000f6771fc0ac85 /arch/sparc | |
| parent | 85afd82780df133f03185aec7943ee3e0ed56a7b (diff) | |
| parent | f056878332a91ed984a116bad4e7d49aefff9e6e (diff) | |
| download | linux-3.10-433c24ed7ff378b22c4d6531a4ce1ffc62642395.tar.gz linux-3.10-433c24ed7ff378b22c4d6531a4ce1ffc62642395.tar.bz2 linux-3.10-433c24ed7ff378b22c4d6531a4ce1ffc62642395.zip | |
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6:
power_supply: Add driver for the PMU on WM831x PMICs
ds2760_battery: Fix integer overflow for time_to_empty_now
wm97xx_battery: Convert to dev_pm_ops
wm97xx_battery: Use irq to detect charger state
wm97xx_battery: Use platform_data
wm97xx-core: Pass platform_data to battery
ds2760_battery: implement set_charged() feature
power_supply: get_by_name and set_charged functionality
power_supply: EXPORT_SYMBOL cleanups
ds2760_battery: add current_accum module parameter
ds2760_battery: handle full_active_uAh == 0 case correctly
ds2760_battery: add rated_capacity module parameter
ds2760_battery: export more features
ds2760_battery: delay power supply registration
wm8350_power: Implement charge type property
power_supply: Add a charge_type property, and use it for olpc driver
olpc_battery: Add an 'error' sysfs device that displays raw errors
Revert "power: remove POWER_SUPPLY_PROP_CAPACITY_LEVEL"
Diffstat (limited to 'arch/sparc')
0 files changed, 0 insertions, 0 deletions