]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge git://git.infradead.org/battery-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 May 2010 15:00:13 +0000 (08:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 May 2010 15:00:13 +0000 (08:00 -0700)
commit15953654cc312429740fd58fb37a5a3d63a54376
treebbb6bf8d4ea943545e29ce896848182c4f206298
parentc3ed9ea4ab460080dea9449c709be9316c670c72
parent24af3202459d9a25643009b1ab8ab5ff04d94b49
Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6:
  ds2760_battery: Document ABI change
  ds2760_battery: Make charge_now and charge_full writeable
  power_supply: Add support for writeable properties
  power_supply: Use attribute groups
  power_supply: Add test_power driver
  tosa_battery: Fix build error due to direct driver_data usage
  wm97xx_battery: Quieten sparse warning (bat_set_pdata not declared)
  ds2782_battery: Get rid of magic numbers in driver_data
  ds2782_battery: Add support for ds2786 battery gas gauge
  pda_power: Add function callbacks for suspend and resume
  wm831x_power: Use genirq
  Driver for Zipit Z2 battery chip
  ds2782_battery: Fix clientdata on removal