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

1 files changed, 20 insertions, 0 deletions

diff --git a/Documentation/ABI/testing/sysfs-class-power b/Documentation/ABI/testing/sysfs-class-power
new file mode 100644
index 000000000000..78c7baca3587
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-class-power
@@ -0,0 +1,20 @@
+What:           /sys/class/power/ds2760-battery.*/charge_now
+Date:           May 2010
+KernelVersion:  2.6.35
+Contact:        Daniel Mack <daniel@caiaq.de>
+Description:
+                This file is writeable and can be used to set the current
+                coloumb counter value inside the battery monitor chip. This
+                is needed for unavoidable corrections of aging batteries.
+                A userspace daemon can monitor the battery charging logic
+                and once the counter drops out of considerable bounds, take
+                appropriate action.
+
+What:           /sys/class/power/ds2760-battery.*/charge_full
+Date:           May 2010
+KernelVersion:  2.6.35
+Contact:        Daniel Mack <daniel@caiaq.de>
+Description:
+                This file is writeable and can be used to set the assumed
+                battery 'full level'. As batteries age, this value has to be
+                amended over time.