9 files changed, 113 insertions, 14 deletions

diff --git a/Documentation/ABI/removed/o2cb b/Documentation/ABI/removed/o2cb
index 7f5daa465093..20c91adca6d4 100644
--- a/Documentation/ABI/removed/o2cb
+++ b/Documentation/ABI/removed/o2cb
@@ -1,6 +1,6 @@
 What:           /sys/o2cb symlink
 Date:           May 2011
-KernelVersion:  2.6.40
+KernelVersion:  3.0
 Contact:        ocfs2-devel@oss.oracle.com
 Description:    This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink is
                 removed when new versions of ocfs2-tools which know to look
diff --git a/Documentation/ABI/removed/raw1394 b/Documentation/ABI/removed/raw1394
index 490aa1efc4ae..ec333e676322 100644
--- a/Documentation/ABI/removed/raw1394
+++ b/Documentation/ABI/removed/raw1394
@@ -5,7 +5,7 @@ Description:
         /dev/raw1394 was a character device file that allowed low-level
         access to FireWire buses.  Its major drawbacks were its inability
         to implement sensible device security policies, and its low level
-        of abstraction that required userspace clients do duplicate much
+        of abstraction that required userspace clients to duplicate much
         of the kernel's ieee1394 core functionality.
         Replaced by /dev/fw*, i.e. the <linux/firewire-cdev.h> ABI of
         firewire-core.
diff --git a/Documentation/ABI/testing/evm b/Documentation/ABI/testing/evm
new file mode 100644
index 000000000000..8374d4557e5d
--- /dev/null
+++ b/Documentation/ABI/testing/evm
@@ -0,0 +1,23 @@
+What:           security/evm
+Date:           March 2011
+Contact:        Mimi Zohar <zohar@us.ibm.com>
+Description:
+                EVM protects a file's security extended attributes(xattrs)
+                against integrity attacks. The initial method maintains an
+                HMAC-sha1 value across the extended attributes, storing the
+                value as the extended attribute 'security.evm'.
+
+                EVM depends on the Kernel Key Retention System to provide it
+                with a trusted/encrypted key for the HMAC-sha1 operation.
+                The key is loaded onto the root's keyring using keyctl.  Until
+                EVM receives notification that the key has been successfully
+                loaded onto the keyring (echo 1 > <securityfs>/evm), EVM
+                can not create or validate the 'security.evm' xattr, but
+                returns INTEGRITY_UNKNOWN.  Loading the key and signaling EVM
+                should be done as early as possible.  Normally this is done
+                in the initramfs, which has already been measured as part
+                of the trusted boot.  For more information on creating and
+                loading existing trusted/encrypted keys, refer to:
+                Documentation/keys-trusted-encrypted.txt.  (A sample dracut
+                patch, which loads the trusted/encrypted key and enables
+                EVM, is available from http://linux-ima.sourceforge.net/#EVM.)
diff --git a/Documentation/ABI/testing/sysfs-bus-bcma b/Documentation/ABI/testing/sysfs-bus-bcma
index 06b62badddd1..721b4aea3020 100644
--- a/Documentation/ABI/testing/sysfs-bus-bcma
+++ b/Documentation/ABI/testing/sysfs-bus-bcma
@@ -1,6 +1,6 @@
 What:           /sys/bus/bcma/devices/.../manuf
 Date:           May 2011
-KernelVersion:  2.6.40
+KernelVersion:  3.0
 Contact:        Rafał Miłecki <zajec5@gmail.com>
 Description:
                 Each BCMA core has it's manufacturer id. See
@@ -8,7 +8,7 @@ Description:
 
 What:           /sys/bus/bcma/devices/.../id
 Date:           May 2011
-KernelVersion:  2.6.40
+KernelVersion:  3.0
 Contact:        Rafał Miłecki <zajec5@gmail.com>
 Description:
                 There are a few types of BCMA cores, they can be identified by
@@ -16,7 +16,7 @@ Description:
 
 What:           /sys/bus/bcma/devices/.../rev
 Date:           May 2011
-KernelVersion:  2.6.40
+KernelVersion:  3.0
 Contact:        Rafał Miłecki <zajec5@gmail.com>
 Description:
                 BCMA cores of the same type can still slightly differ depending
@@ -24,7 +24,7 @@ Description:
 
 What:           /sys/bus/bcma/devices/.../class
 Date:           May 2011
-KernelVersion:  2.6.40
+KernelVersion:  3.0
 Contact:        Rafał Miłecki <zajec5@gmail.com>
 Description:
                 Each BCMA core is identified by few fields, including class it
diff --git a/Documentation/ABI/testing/sysfs-bus-pci-drivers-ehci_hcd b/Documentation/ABI/testing/sysfs-bus-pci-drivers-ehci_hcd
new file mode 100644
index 000000000000..60c60fa624b2
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-pci-drivers-ehci_hcd
@@ -0,0 +1,46 @@
+What:           /sys/bus/pci/drivers/ehci_hcd/.../companion
+                /sys/bus/usb/devices/usbN/../companion
+Date:           January 2007
+KernelVersion:  2.6.21
+Contact:        Alan Stern <stern@rowland.harvard.edu>
+Description:
+                PCI-based EHCI USB controllers (i.e., high-speed USB-2.0
+                controllers) are often implemented along with a set of
+                "companion" full/low-speed USB-1.1 controllers.  When a
+                high-speed device is plugged in, the connection is routed
+                to the EHCI controller; when a full- or low-speed device
+                is plugged in, the connection is routed to the companion
+                controller.
+
+                Sometimes you want to force a high-speed device to connect
+                at full speed, which can be accomplished by forcing the
+                connection to be routed to the companion controller.
+                That's what this file does.  Writing a port number to the
+                file causes connections on that port to be routed to the
+                companion controller, and writing the negative of a port
+                number returns the port to normal operation.
+
+                For example: To force the high-speed device attached to
+                port 4 on bus 2 to run at full speed:
+
+                        echo 4 >/sys/bus/usb/devices/usb2/../companion
+
+                To return the port to high-speed operation:
+
+                        echo -4 >/sys/bus/usb/devices/usb2/../companion
+
+                Reading the file gives the list of ports currently forced
+                to the companion controller.
+
+                Note: Some EHCI controllers do not have companions; they
+                may contain an internal "transaction translator" or they
+                may be attached directly to a "rate-matching hub".  This
+                mechanism will not work with such controllers.  Also, it
+                cannot be used to force a port on a high-speed hub to
+                connect at full speed.
+
+                Note: When this file was first added, it appeared in a
+                different sysfs directory.  The location given above is
+                correct for 2.6.35 (and probably several earlier kernel
+                versions as well).
+
diff --git a/Documentation/ABI/testing/sysfs-bus-usb b/Documentation/ABI/testing/sysfs-bus-usb
index 294aa864a60a..e647378e9e88 100644
--- a/Documentation/ABI/testing/sysfs-bus-usb
+++ b/Documentation/ABI/testing/sysfs-bus-usb
@@ -142,3 +142,18 @@ Description:
                 such devices.
 Users:
                 usb_modeswitch
+
+What:           /sys/bus/usb/devices/.../power/usb2_hardware_lpm
+Date:           September 2011
+Contact:        Andiry Xu <andiry.xu@amd.com>
+Description:
+                If CONFIG_USB_SUSPEND is set and a USB 2.0 lpm-capable device
+                is plugged in to a xHCI host which support link PM, it will
+                perform a LPM test; if the test is passed and host supports
+                USB2 hardware LPM (xHCI 1.0 feature), USB2 hardware LPM will
+                be enabled for the device and the USB device directory will
+                contain a file named power/usb2_hardware_lpm.  The file holds
+                a string value (enable or disable) indicating whether or not
+                USB2 hardware LPM is enabled for the device. Developer can
+                write y/Y/1 or n/N/0 to the file to enable/disable the
+                feature.
diff --git a/Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870 b/Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870
index aa11dbdd794b..4a9c545bda4b 100644
--- a/Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870
+++ b/Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870
@@ -4,8 +4,8 @@ What:		/sys/class/backlight/<backlight>/l2_bright_max
 What:           /sys/class/backlight/<backlight>/l3_office_max
 What:           /sys/class/backlight/<backlight>/l4_indoor_max
 What:           /sys/class/backlight/<backlight>/l5_dark_max
-Date:           Mai 2011
-KernelVersion:  2.6.40
+Date:           May 2011
+KernelVersion:  3.0
 Contact:        device-drivers-devel@blackfin.uclinux.org
 Description:
                 Control the maximum brightness for <ambient light zone>
@@ -18,8 +18,8 @@ What:		/sys/class/backlight/<backlight>/l2_bright_dim
 What:           /sys/class/backlight/<backlight>/l3_office_dim
 What:           /sys/class/backlight/<backlight>/l4_indoor_dim
 What:           /sys/class/backlight/<backlight>/l5_dark_dim
-Date:           Mai 2011
-KernelVersion:  2.6.40
+Date:           May 2011
+KernelVersion:  3.0
 Contact:        device-drivers-devel@blackfin.uclinux.org
 Description:
                 Control the dim brightness for <ambient light zone>
@@ -29,8 +29,8 @@ Description:
                 this <ambient light zone>.
 
 What:           /sys/class/backlight/<backlight>/ambient_light_level
-Date:           Mai 2011
-KernelVersion:  2.6.40
+Date:           May 2011
+KernelVersion:  3.0
 Contact:        device-drivers-devel@blackfin.uclinux.org
 Description:
                 Get conversion value of the light sensor.
@@ -39,8 +39,8 @@ Description:
                 8000 (max ambient brightness)
 
 What:           /sys/class/backlight/<backlight>/ambient_light_zone
-Date:           Mai 2011
-KernelVersion:  2.6.40
+Date:           May 2011
+KernelVersion:  3.0
 Contact:        device-drivers-devel@blackfin.uclinux.org
 Description:
                 Get/Set current ambient light zone. Reading returns
diff --git a/Documentation/ABI/testing/sysfs-class-net-mesh b/Documentation/ABI/testing/sysfs-class-net-mesh
index 748fe1701d25..b02001488eef 100644
--- a/Documentation/ABI/testing/sysfs-class-net-mesh
+++ b/Documentation/ABI/testing/sysfs-class-net-mesh
@@ -22,6 +22,14 @@ Description:
                 mesh will be fragmented or silently discarded if the
                 packet size exceeds the outgoing interface MTU.
 
+What:           /sys/class/net/<mesh_iface>/mesh/ap_isolation
+Date:           May 2011
+Contact:        Antonio Quartulli <ordex@autistici.org>
+Description:
+                Indicates whether the data traffic going from a
+                wireless client to another wireless client will be
+                silently dropped.
+
 What:           /sys/class/net/<mesh_iface>/mesh/gw_bandwidth
 Date:           October 2010
 Contact:        Marek Lindner <lindner_marek@yahoo.de>
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.