7 files changed, 88 insertions, 1 deletions

diff --git a/Documentation/ABI/obsolete/proc-pid-oom_adj b/Documentation/ABI/obsolete/proc-pid-oom_adj
index cf63f264ce0f..9a3cb88ade47 100644
--- a/Documentation/ABI/obsolete/proc-pid-oom_adj
+++ b/Documentation/ABI/obsolete/proc-pid-oom_adj
@@ -14,7 +14,7 @@ Why:	/proc/<pid>/oom_adj allows userspace to influence the oom killer's
 
         A much more powerful interface, /proc/<pid>/oom_score_adj, was
         introduced with the oom killer rewrite that allows users to increase or
-        decrease the badness() score linearly.  This interface will replace
+        decrease the badness score linearly.  This interface will replace
         /proc/<pid>/oom_adj.
 
         A warning will be emitted to the kernel log if an application uses this
diff --git a/Documentation/ABI/testing/pstore b/Documentation/ABI/testing/pstore
index ddf451ee2a08..ff1df4e3b059 100644
--- a/Documentation/ABI/testing/pstore
+++ b/Documentation/ABI/testing/pstore
@@ -39,3 +39,9 @@ Description:	Generic interface to platform dependent persistent storage.
                 multiple) files based on the record size of the underlying
                 persistent storage until at least this amount is reached.
                 Default is 10 Kbytes.
+
+                Pstore only supports one backend at a time. If multiple
+                backends are available, the preferred backend may be
+                set by passing the pstore.backend= argument to the kernel at
+                boot time.
+
diff --git a/Documentation/ABI/testing/sysfs-bus-i2c-devices-fsa9480 b/Documentation/ABI/testing/sysfs-bus-i2c-devices-fsa9480
new file mode 100644
index 000000000000..9de269bb0ae5
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-i2c-devices-fsa9480
@@ -0,0 +1,21 @@
+What:           /sys/bus/i2c/devices/.../device
+Date:           February 2011
+Contact:        Minkyu Kang <mk7.kang@samsung.com>
+Description:
+                show what device is attached
+                NONE - no device
+                USB - USB device is attached
+                UART - UART is attached
+                CHARGER - Charger is attaced
+                JIG - JIG is attached
+
+What:           /sys/bus/i2c/devices/.../switch
+Date:           February 2011
+Contact:        Minkyu Kang <mk7.kang@samsung.com>
+Description:
+                show or set the state of manual switch
+                VAUDIO - switch to VAUDIO path
+                UART - switch to UART path
+                AUDIO - switch to AUDIO path
+                DHOST - switch to DHOST path
+                AUTO - switch automatically by device
diff --git a/Documentation/ABI/testing/sysfs-class-scsi_host b/Documentation/ABI/testing/sysfs-class-scsi_host
new file mode 100644
index 000000000000..29a4f892e433
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-class-scsi_host
@@ -0,0 +1,13 @@
+What:           /sys/class/scsi_host/hostX/isci_id
+Date:           June 2011
+Contact:        Dave Jiang <dave.jiang@intel.com>
+Description:
+                This file contains the enumerated host ID for the Intel
+                SCU controller. The Intel(R) C600 Series Chipset SATA/SAS
+                Storage Control Unit embeds up to two 4-port controllers in
+                a single PCI device.  The controllers are enumerated in order
+                which usually means the lowest number scsi_host corresponds
+                with the first controller, but this association is not
+                guaranteed.  The 'isci_id' attribute unambiguously identifies
+                the controller index: '0' for the first controller,
+                '1' for the second.
diff --git a/Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff b/Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff
new file mode 100644
index 000000000000..9aec8ef228b0
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff
@@ -0,0 +1,7 @@
+What:           /sys/module/hid_logitech/drivers/hid:logitech/<dev>/range.
+Date:           July 2011
+KernelVersion:  3.2
+Contact:        Michal Malı <madcatxster@gmail.com>
+Description:    Display minimum, maximum and current range of the steering
+                wheel. Writing a value within min and max boundaries sets the
+                range of the wheel.
diff --git a/Documentation/ABI/testing/sysfs-module b/Documentation/ABI/testing/sysfs-module
index cfcec3bffc0a..9489ea8e294c 100644
--- a/Documentation/ABI/testing/sysfs-module
+++ b/Documentation/ABI/testing/sysfs-module
@@ -10,3 +10,26 @@ KernelVersion:	2.6.35
 Contact:        masa-korg@dsn.okisemi.com
 Description:    Write/read Option ROM data.
 
+
+What:           /sys/module/ehci_hcd/drivers/.../uframe_periodic_max
+Date:           July 2011
+KernelVersion:  3.1
+Contact:        Kirill Smelkov <kirr@mns.spb.ru>
+Description:    Maximum time allowed for periodic transfers per microframe (μs)
+
+                [ USB 2.0 sets maximum allowed time for periodic transfers per
+                  microframe to be 80%, that is 100 microseconds out of 125
+                  microseconds (full microframe).
+
+                  However there are cases, when 80% max isochronous bandwidth is
+                  too limiting. For example two video streams could require 110
+                  microseconds of isochronous bandwidth per microframe to work
+                  together. ]
+
+                Through this setting it is possible to raise the limit so that
+                the host controller would allow allocating more than 100
+                microseconds of periodic bandwidth per microframe.
+
+                Beware, non-standard modes are usually not thoroughly tested by
+                hardware designers, and the hardware can malfunction when this
+                setting differ from default 100.
diff --git a/Documentation/ABI/testing/sysfs-platform-ideapad-laptop b/Documentation/ABI/testing/sysfs-platform-ideapad-laptop
index 807fca2ae2a4..ff53183c3848 100644
--- a/Documentation/ABI/testing/sysfs-platform-ideapad-laptop
+++ b/Documentation/ABI/testing/sysfs-platform-ideapad-laptop
@@ -4,3 +4,20 @@ KernelVersion:	2.6.37
 Contact:        "Ike Panhc <ike.pan@canonical.com>"
 Description:
                 Control the power of camera module. 1 means on, 0 means off.
+
+What:           /sys/devices/platform/ideapad/cfg
+Date:           Jun 2011
+KernelVersion:  3.1
+Contact:        "Ike Panhc <ike.pan@canonical.com>"
+Description:
+                Ideapad capability bits.
+                Bit 8-10: 1 - Intel graphic only
+                          2 - ATI graphic only
+                          3 - Nvidia graphic only
+                          4 - Intel and ATI graphic
+                          5 - Intel and Nvidia graphic
+                Bit 16: Bluetooth exist (1 for exist)
+                Bit 17: 3G exist (1 for exist)
+                Bit 18: Wifi exist (1 for exist)
+                Bit 19: Camera exist (1 for exist)
+