5 files changed, 93 insertions, 0 deletions

diff --git a/Documentation/ABI/testing/debugfs-olpc b/Documentation/ABI/testing/debugfs-olpc
new file mode 100644
index 000000000000..bd76cc6d55f9
--- /dev/null
+++ b/Documentation/ABI/testing/debugfs-olpc
@@ -0,0 +1,16 @@
+What:           /sys/kernel/debug/olpc-ec/cmd
+Date:           Dec 2011
+KernelVersion:  3.4
+Contact:        devel@lists.laptop.org
+Description:
+
+A generic interface for executing OLPC Embedded Controller commands and
+reading their responses.
+
+To execute a command, write data with the format: CC:N A A A A
+CC is the (hex) command, N is the count of expected reply bytes, and A A A A
+are optional (hex) arguments.
+
+To read the response (if any), read from the generic node after executing
+a command. Hex reply bytes will be returned, *whether or not* they came from
+the immediately previous command.
diff --git a/Documentation/ABI/testing/sysfs-block-dm b/Documentation/ABI/testing/sysfs-block-dm
new file mode 100644
index 000000000000..87ca5691e29b
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-block-dm
@@ -0,0 +1,25 @@
+What:           /sys/block/dm-<num>/dm/name
+Date:           January 2009
+KernelVersion:  2.6.29
+Contact:        dm-devel@redhat.com
+Description:    Device-mapper device name.
+                Read-only string containing mapped device name.
+Users:          util-linux, device-mapper udev rules
+
+What:           /sys/block/dm-<num>/dm/uuid
+Date:           January 2009
+KernelVersion:  2.6.29
+Contact:        dm-devel@redhat.com
+Description:    Device-mapper device UUID.
+                Read-only string containing DM-UUID or empty string
+                if DM-UUID is not set.
+Users:          util-linux, device-mapper udev rules
+
+What:           /sys/block/dm-<num>/dm/suspended
+Date:           June 2009
+KernelVersion:  2.6.31
+Contact:        dm-devel@redhat.com
+Description:    Device-mapper device suspend state.
+                Contains the value 1 while the device is suspended.
+                Otherwise it contains 0. Read-only attribute.
+Users:          util-linux, device-mapper udev rules
diff --git a/Documentation/ABI/testing/sysfs-bus-event_source-devices-format b/Documentation/ABI/testing/sysfs-bus-event_source-devices-format
new file mode 100644
index 000000000000..079afc71363d
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-event_source-devices-format
@@ -0,0 +1,14 @@
+Where:          /sys/bus/event_source/devices/<dev>/format
+Date:           January 2012
+Kernel Version: 3.3
+Contact:        Jiri Olsa <jolsa@redhat.com>
+Description:
+                Attribute group to describe the magic bits that go into
+                perf_event_attr::config[012] for a particular pmu.
+                Each attribute of this group defines the 'hardware' bitmask
+                we want to export, so that userspace can deal with sane
+                name/value pairs.
+
+                Example: 'config1:1,6-10,44'
+                Defines contents of attribute that occupies bits 1,6-10,44 of
+                perf_event_attr::config1.
diff --git a/Documentation/ABI/testing/sysfs-driver-samsung-laptop b/Documentation/ABI/testing/sysfs-driver-samsung-laptop
index e82e7c2b8f80..678819a3f8bf 100644
--- 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.
diff --git a/Documentation/ABI/testing/sysfs-firmware-acpi b/Documentation/ABI/testing/sysfs-firmware-acpi
index 4f9ba3c2fca7..dd930c8db41f 100644
--- a/Documentation/ABI/testing/sysfs-firmware-acpi
+++ b/Documentation/ABI/testing/sysfs-firmware-acpi
@@ -1,3 +1,23 @@
+What:           /sys/firmware/acpi/bgrt/
+Date:           January 2012
+Contact:        Matthew Garrett <mjg@redhat.com>
+Description:
+                The BGRT is an ACPI 5.0 feature that allows the OS
+                to obtain a copy of the firmware boot splash and
+                some associated metadata. This is intended to be used
+                by boot splash applications in order to interact with
+                the firmware boot splash in order to avoid jarring
+                transitions.
+
+                image: The image bitmap. Currently a 32-bit BMP.
+                status: 1 if the image is valid, 0 if firmware invalidated it.
+                type: 0 indicates image is in BMP format.
+                version: The version of the BGRT. Currently 1.
+                xoffset: The number of pixels between the left of the screen
+                         and the left edge of the image.
+                yoffset: The number of pixels between the top of the screen
+                         and the top edge of the image.
+
 What:           /sys/firmware/acpi/interrupts/
 Date:           February 2008
 Contact:        Len Brown <lenb@kernel.org>