6 files changed, 54 insertions, 2 deletions

diff --git a/Documentation/ABI/stable/sysfs-driver-qla2xxx b/Documentation/ABI/stable/sysfs-driver-qla2xxx
new file mode 100644
index 000000000000..9a59d84497ed
--- /dev/null
+++ b/Documentation/ABI/stable/sysfs-driver-qla2xxx
@@ -0,0 +1,8 @@
+What:           /sys/bus/pci/drivers/qla2xxx/.../devices/*
+Date:           September 2009
+Contact:        QLogic Linux Driver <linux-driver@qlogic.com>
+Description:    qla2xxx-udev.sh currently looks for uevent CHANGE events to
+                signal a firmware-dump has been generated by the driver and is
+                ready for retrieval.
+Users:          qla2xxx-udev.sh.  Proposed changes should be mailed to
+                linux-driver@qlogic.com
diff --git a/Documentation/ABI/testing/procfs-diskstats b/Documentation/ABI/testing/procfs-diskstats
index 99233902e09e..f91a973a37fe 100644
--- a/Documentation/ABI/testing/procfs-diskstats
+++ b/Documentation/ABI/testing/procfs-diskstats
@@ -8,7 +8,7 @@ Description:
                  1 - major number
                  2 - minor mumber
                  3 - device name
-                 4 - reads completed succesfully
+                 4 - reads completed successfully
                  5 - reads merged
                  6 - sectors read
                  7 - time spent reading (ms)
diff --git a/Documentation/ABI/testing/sysfs-block b/Documentation/ABI/testing/sysfs-block
index 5f3bedaf8e35..d2f90334bb93 100644
--- a/Documentation/ABI/testing/sysfs-block
+++ b/Documentation/ABI/testing/sysfs-block
@@ -4,7 +4,7 @@ Contact:	Jerome Marchand <jmarchan@redhat.com>
 Description:
                 The /sys/block/<disk>/stat files displays the I/O
                 statistics of disk <disk>. They contain 11 fields:
-                 1 - reads completed succesfully
+                 1 - reads completed successfully
                  2 - reads merged
                  3 - sectors read
                  4 - time spent reading (ms)
diff --git a/Documentation/ABI/testing/sysfs-bus-usb b/Documentation/ABI/testing/sysfs-bus-usb
index 7772928ee48f..deb6b489e4e5 100644
--- a/Documentation/ABI/testing/sysfs-bus-usb
+++ b/Documentation/ABI/testing/sysfs-bus-usb
@@ -144,3 +144,16 @@ Description:
 
                 Write a 1 to force the device to disconnect
                 (equivalent to unplugging a wired USB device).
+
+What:           /sys/bus/usb/drivers/.../remove_id
+Date:           November 2009
+Contact:        CHENG Renquan <rqcheng@smu.edu.sg>
+Description:
+                Writing a device ID to this file will remove an ID
+                that was dynamically added via the new_id sysfs entry.
+                The format for the device ID is:
+                idVendor idProduct.     After successfully
+                removing an ID, the driver will no longer support the
+                device.  This is useful to ensure auto probing won't
+                match the driver to the device.  For example:
+                # echo "046d c315" > /sys/bus/usb/drivers/foo/remove_id
diff --git a/Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc b/Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc
index 4e8106f7cfd9..25b1e751b777 100644
--- a/Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc
+++ b/Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc
@@ -23,3 +23,16 @@ Description:
                 Since this relates to security (specifically, the
                 lifetime of PTKs and GTKs) it should not be changed
                 from the default.
+
+What:           /sys/class/uwb_rc/uwbN/wusbhc/wusb_phy_rate
+Date:           August 2009
+KernelVersion:  2.6.32
+Contact:        David Vrabel <david.vrabel@csr.com>
+Description:
+                The maximum PHY rate to use for all connected devices.
+                This is only of limited use for testing and
+                development as the hardware's automatic rate
+                adaptation is better then this simple control.
+
+                Refer to [ECMA-368] section 10.3.1.1 for the value to
+                use.
diff --git a/Documentation/ABI/testing/sysfs-devices-system-cpu b/Documentation/ABI/testing/sysfs-devices-system-cpu
index a703b9e9aeb9..974e29f5da86 100644
--- a/Documentation/ABI/testing/sysfs-devices-system-cpu
+++ b/Documentation/ABI/testing/sysfs-devices-system-cpu
@@ -136,6 +136,24 @@ Description:	Discover cpuidle policy and mechanism
                 See files in Documentation/cpuidle/ for more information.
 
 
+What:           /sys/devices/system/cpu/cpu#/cpufreq/*
+Date:           pre-git history
+Contact:        cpufreq@vger.kernel.org
+Description:    Discover and change clock speed of CPUs
+
+                Clock scaling allows you to change the clock speed of the
+                CPUs on the fly. This is a nice method to save battery
+                power, because the lower the clock speed, the less power
+                the CPU consumes.
+
+                There are many knobs to tweak in this directory.
+
+                See files in Documentation/cpu-freq/ for more information.
+
+                In particular, read Documentation/cpu-freq/user-guide.txt
+                to learn how to control the knobs.
+
+
 What:      /sys/devices/system/cpu/cpu*/cache/index*/cache_disable_X
 Date:      August 2008
 KernelVersion:  2.6.27