10 files changed, 87 insertions, 11 deletions

diff --git a/Documentation/ABI/obsolete/sysfs-class-rfkill b/Documentation/ABI/obsolete/sysfs-class-rfkill
index 4201d5b05515..ff60ad9eca4c 100644
--- a/Documentation/ABI/obsolete/sysfs-class-rfkill
+++ b/Documentation/ABI/obsolete/sysfs-class-rfkill
@@ -7,7 +7,7 @@ Date:		09-Jul-2007
 KernelVersion   v2.6.22
 Contact:        linux-wireless@vger.kernel.org
 Description:    Current state of the transmitter.
-                This file is deprecated and sheduled to be removed in 2014,
+                This file is deprecated and scheduled to be removed in 2014,
                 because its not possible to express the 'soft and hard block'
                 state of the rfkill driver.
 Values:         A numeric value.
diff --git a/Documentation/ABI/removed/devfs b/Documentation/ABI/removed/devfs
index 8ffd28bf6598..0020c49933c4 100644
--- a/Documentation/ABI/removed/devfs
+++ b/Documentation/ABI/removed/devfs
@@ -1,6 +1,6 @@
 What:           devfs
 Date:           July 2005 (scheduled), finally removed in kernel v2.6.18
-Contact:        Greg Kroah-Hartman <gregkh@suse.de>
+Contact:        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 Description:
         devfs has been unmaintained for a number of years, has unfixable
         races, contains a naming policy within the kernel that is
diff --git a/Documentation/ABI/stable/sysfs-driver-usb-usbtmc b/Documentation/ABI/stable/sysfs-driver-usb-usbtmc
index 9a75fb22187d..23a43b8207e6 100644
--- a/Documentation/ABI/stable/sysfs-driver-usb-usbtmc
+++ b/Documentation/ABI/stable/sysfs-driver-usb-usbtmc
@@ -1,7 +1,7 @@
 What:           /sys/bus/usb/drivers/usbtmc/devices/*/interface_capabilities
 What:           /sys/bus/usb/drivers/usbtmc/devices/*/device_capabilities
 Date:           August 2008
-Contact:        Greg Kroah-Hartman <gregkh@suse.de>
+Contact:        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 Description:
                 These files show the various USB TMC capabilities as described
                 by the device itself.  The full description of the bitfields
@@ -15,7 +15,7 @@ Description:
 What:           /sys/bus/usb/drivers/usbtmc/devices/*/usb488_interface_capabilities
 What:           /sys/bus/usb/drivers/usbtmc/devices/*/usb488_device_capabilities
 Date:           August 2008
-Contact:        Greg Kroah-Hartman <gregkh@suse.de>
+Contact:        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 Description:
                 These files show the various USB TMC capabilities as described
                 by the device itself.  The full description of the bitfields
@@ -29,7 +29,7 @@ Description:
 
 What:           /sys/bus/usb/drivers/usbtmc/devices/*/TermChar
 Date:           August 2008
-Contact:        Greg Kroah-Hartman <gregkh@suse.de>
+Contact:        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 Description:
                 This file is the TermChar value to be sent to the USB TMC
                 device as described by the document, "Universal Serial Bus Test
@@ -42,7 +42,7 @@ Description:
 
 What:           /sys/bus/usb/drivers/usbtmc/devices/*/TermCharEnabled
 Date:           August 2008
-Contact:        Greg Kroah-Hartman <gregkh@suse.de>
+Contact:        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 Description:
                 This file determines if the TermChar is to be sent to the
                 device on every transaction or not.  For more details about
@@ -53,7 +53,7 @@ Description:
 
 What:           /sys/bus/usb/drivers/usbtmc/devices/*/auto_abort
 Date:           August 2008
-Contact:        Greg Kroah-Hartman <gregkh@suse.de>
+Contact:        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 Description:
                 This file determines if the the transaction of the USB TMC
                 device is to be automatically aborted if there is any error.
diff --git a/Documentation/ABI/stable/sysfs-module b/Documentation/ABI/stable/sysfs-module
index 75be43118335..a0dd21c6db59 100644
--- a/Documentation/ABI/stable/sysfs-module
+++ b/Documentation/ABI/stable/sysfs-module
@@ -6,7 +6,7 @@ Description:
                 The name of the module that is in the kernel.  This
                 module name will show up either if the module is built
                 directly into the kernel, or if it is loaded as a
-                dyanmic module.
+                dynamic module.
 
         /sys/module/MODULENAME/parameters
                 This directory contains individual files that are each
diff --git a/Documentation/ABI/testing/sysfs-bus-usb b/Documentation/ABI/testing/sysfs-bus-usb
index b4f548792e32..7c22a532fdfb 100644
--- a/Documentation/ABI/testing/sysfs-bus-usb
+++ b/Documentation/ABI/testing/sysfs-bus-usb
@@ -182,3 +182,14 @@ Description:
                 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.
+
+What:           /sys/bus/usb/devices/.../removable
+Date:           February 2012
+Contact:        Matthew Garrett <mjg@redhat.com>
+Description:
+                Some information about whether a given USB device is
+                physically fixed to the platform can be inferred from a
+                combination of hub decriptor bits and platform-specific data
+                such as ACPI. This file will read either "removable" or
+                "fixed" if the information is available, and "unknown"
+                otherwise.
\ No newline at end of file
diff --git a/Documentation/ABI/testing/sysfs-class b/Documentation/ABI/testing/sysfs-class
index 4b0cb891e46e..676530fcf747 100644
--- a/Documentation/ABI/testing/sysfs-class
+++ b/Documentation/ABI/testing/sysfs-class
@@ -1,6 +1,6 @@
 What:           /sys/class/
 Date:           Febuary 2006
-Contact:        Greg Kroah-Hartman <gregkh@suse.de>
+Contact:        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 Description:
                 The /sys/class directory will consist of a group of
                 subdirectories describing individual classes of devices
diff --git a/Documentation/ABI/testing/sysfs-class-net-mesh b/Documentation/ABI/testing/sysfs-class-net-mesh
index b02001488eef..b218e0f8bdb3 100644
--- a/Documentation/ABI/testing/sysfs-class-net-mesh
+++ b/Documentation/ABI/testing/sysfs-class-net-mesh
@@ -65,6 +65,13 @@ Description:
                 Defines the penalty which will be applied to an
                 originator message's tq-field on every hop.
 
+What:           /sys/class/net/<mesh_iface>/mesh/routing_algo
+Date:           Dec 2011
+Contact:        Marek Lindner <lindner_marek@yahoo.de>
+Description:
+                Defines the routing procotol this mesh instance
+                uses to find the optimal paths through the mesh.
+
 What:           /sys/class/net/<mesh_iface>/mesh/vis_mode
 Date:           May 2010
 Contact:        Marek Lindner <lindner_marek@yahoo.de>
diff --git a/Documentation/ABI/testing/sysfs-devices b/Documentation/ABI/testing/sysfs-devices
index 6a25671ee5f6..5fcc94358b8d 100644
--- a/Documentation/ABI/testing/sysfs-devices
+++ b/Documentation/ABI/testing/sysfs-devices
@@ -1,6 +1,6 @@
 What:           /sys/devices
 Date:           February 2006
-Contact:        Greg Kroah-Hartman <gregkh@suse.de>
+Contact:        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 Description:
                 The /sys/devices tree contains a snapshot of the
                 internal state of the kernel device tree.  Devices will
diff --git a/Documentation/ABI/testing/sysfs-devices-soc b/Documentation/ABI/testing/sysfs-devices-soc
new file mode 100644
index 000000000000..6d9cc253f2b2
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-devices-soc
@@ -0,0 +1,58 @@
+What:           /sys/devices/socX
+Date:           January 2012
+contact:        Lee Jones <lee.jones@linaro.org>
+Description:
+                The /sys/devices/ directory contains a sub-directory for each
+                System-on-Chip (SoC) device on a running platform. Information
+                regarding each SoC can be obtained by reading sysfs files. This
+                functionality is only available if implemented by the platform.
+
+                The directory created for each SoC will also house information
+                about devices which are commonly contained in /sys/devices/platform.
+                It has been agreed that if an SoC device exists, its supported
+                devices would be better suited to appear as children of that SoC.
+
+What:           /sys/devices/socX/machine
+Date:           January 2012
+contact:        Lee Jones <lee.jones@linaro.org>
+Description:
+                Read-only attribute common to all SoCs. Contains the SoC machine
+                name (e.g. Ux500).
+
+What:           /sys/devices/socX/family
+Date:           January 2012
+contact:        Lee Jones <lee.jones@linaro.org>
+Description:
+                Read-only attribute common to all SoCs. Contains SoC family name
+                (e.g. DB8500).
+
+What:           /sys/devices/socX/soc_id
+Date:           January 2012
+contact:        Lee Jones <lee.jones@linaro.org>
+Description:
+                Read-only attribute supported by most SoCs. In the case of
+                ST-Ericsson's chips this contains the SoC serial number.
+
+What:           /sys/devices/socX/revision
+Date:           January 2012
+contact:        Lee Jones <lee.jones@linaro.org>
+Description:
+                Read-only attribute supported by most SoCs. Contains the SoC's
+                manufacturing revision number.
+
+What:           /sys/devices/socX/process
+Date:           January 2012
+contact:        Lee Jones <lee.jones@linaro.org>
+Description:
+                Read-only attribute supported ST-Ericsson's silicon. Contains the
+                the process by which the silicon chip was manufactured.
+
+What:           /sys/bus/soc
+Date:           January 2012
+contact:        Lee Jones <lee.jones@linaro.org>
+Description:
+                The /sys/bus/soc/ directory contains the usual sub-folders
+                expected under most buses. /sys/bus/soc/devices is of particular
+                interest, as it contains a symlink for each SoC device found on
+                the system. Each symlink points back into the aforementioned
+                /sys/devices/socX devices.
diff --git a/Documentation/ABI/testing/sysfs-driver-samsung-laptop b/Documentation/ABI/testing/sysfs-driver-samsung-laptop
index 0a810231aad4..e82e7c2b8f80 100644
--- a/Documentation/ABI/testing/sysfs-driver-samsung-laptop
+++ b/Documentation/ABI/testing/sysfs-driver-samsung-laptop
@@ -1,7 +1,7 @@
 What:           /sys/devices/platform/samsung/performance_level
 Date:           January 1, 2010
 KernelVersion:  2.6.33
-Contact:        Greg Kroah-Hartman <gregkh@suse.de>
+Contact:        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 Description:    Some Samsung laptops have different "performance levels"
                 that are can be modified by a function key, and by this
                 sysfs file.  These values don't always make a whole lot