Merge tag 'stable/for-linus-3.9-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / Documentation / ABI / testing / sysfs-driver-samsung-laptop

diff --git a/Documentation/ABI/testing/sysfs-driver-samsung-laptop b/Documentation/ABI/testing/sysfs-driver-samsung-laptop
index e82e7c2b8f80c4f789d8bbb9a0b67be26e6fa023..678819a3f8bf89e3b43e134979af2fa3f28199fd 100644 (file)
--- a/Documentation/ABI/testing/sysfs-driver-samsung-laptop
+++ b/Documentation/ABI/testing/sysfs-driver-samsung-laptop
@@ -17,3 +17,21 @@ Description: Some Samsung laptops have different "performance levels"
                Specifically, not all support the "overclock" option,
                and it's still unknown if this value even changes
                anything, other than making the user feel a bit better.
+
+What:          /sys/devices/platform/samsung/battery_life_extender
+Date:          December 1, 2011
+KernelVersion: 3.3
+Contact:       Corentin Chary <corentin.chary@gmail.com>
+Description:   Max battery charge level can be modified, battery cycle
+               life can be extended by reducing the max battery charge
+               level.
+               0 means normal battery mode (100% charge)
+               1 means battery life extender mode (80% charge)
+
+What:          /sys/devices/platform/samsung/usb_charge
+Date:          December 1, 2011
+KernelVersion: 3.3
+Contact:       Corentin Chary <corentin.chary@gmail.com>
+Description:   Use your USB ports to charge devices, even
+               when your laptop is powered off.
+               1 means enabled, 0 means disabled.