13 files changed, 427 insertions, 9 deletions

diff --git a/Documentation/ABI/stable/sysfs-bus-xen-backend b/Documentation/ABI/stable/sysfs-bus-xen-backend
new file mode 100644
index 000000000000..3d5951c8bf5f
--- /dev/null
+++ b/Documentation/ABI/stable/sysfs-bus-xen-backend
@@ -0,0 +1,75 @@
+What:           /sys/bus/xen-backend/devices/*/devtype
+Date:           Feb 2009
+KernelVersion:  2.6.38
+Contact:        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Description:
+                The type of the device.  e.g., one of: 'vbd' (block),
+                'vif' (network), or 'vfb' (framebuffer).
+
+What:           /sys/bus/xen-backend/devices/*/nodename
+Date:           Feb 2009
+KernelVersion:  2.6.38
+Contact:        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Description:
+                XenStore node (under /local/domain/NNN/) for this
+                backend device.
+
+What:           /sys/bus/xen-backend/devices/vbd-*/physical_device
+Date:           April 2011
+KernelVersion:  3.0
+Contact:        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Description:
+                The major:minor number (in hexidecimal) of the
+                physical device providing the storage for this backend
+                block device.
+
+What:           /sys/bus/xen-backend/devices/vbd-*/mode
+Date:           April 2011
+KernelVersion:  3.0
+Contact:        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Description:
+                Whether the block device is read-only ('r') or
+                read-write ('w').
+
+What:           /sys/bus/xen-backend/devices/vbd-*/statistics/f_req
+Date:           April 2011
+KernelVersion:  3.0
+Contact:        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Description:
+                Number of flush requests from the frontend.
+
+What:           /sys/bus/xen-backend/devices/vbd-*/statistics/oo_req
+Date:           April 2011
+KernelVersion:  3.0
+Contact:        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Description:
+                Number of requests delayed because the backend was too
+                busy processing previous requests.
+
+What:           /sys/bus/xen-backend/devices/vbd-*/statistics/rd_req
+Date:           April 2011
+KernelVersion:  3.0
+Contact:        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Description:
+                Number of read requests from the frontend.
+
+What:           /sys/bus/xen-backend/devices/vbd-*/statistics/rd_sect
+Date:           April 2011
+KernelVersion:  3.0
+Contact:        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Description:
+                Number of sectors read by the frontend.
+
+What:           /sys/bus/xen-backend/devices/vbd-*/statistics/wr_req
+Date:           April 2011
+KernelVersion:  3.0
+Contact:        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Description:
+                Number of write requests from the frontend.
+
+What:           /sys/bus/xen-backend/devices/vbd-*/statistics/wr_sect
+Date:           April 2011
+KernelVersion:  3.0
+Contact:        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Description:
+                Number of sectors written by the frontend.
diff --git a/Documentation/ABI/stable/sysfs-devices-system-xen_memory b/Documentation/ABI/stable/sysfs-devices-system-xen_memory
new file mode 100644
index 000000000000..caa311d59ac1
--- /dev/null
+++ b/Documentation/ABI/stable/sysfs-devices-system-xen_memory
@@ -0,0 +1,77 @@
+What:           /sys/devices/system/xen_memory/xen_memory0/max_retry_count
+Date:           May 2011
+KernelVersion:  2.6.39
+Contact:        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Description:
+                The maximum number of times the balloon driver will
+                attempt to increase the balloon before giving up.  See
+                also 'retry_count' below.
+                A value of zero means retry forever and is the default one.
+
+What:           /sys/devices/system/xen_memory/xen_memory0/max_schedule_delay
+Date:           May 2011
+KernelVersion:  2.6.39
+Contact:        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Description:
+                The limit that 'schedule_delay' (see below) will be
+                increased to. The default value is 32 seconds.
+
+What:           /sys/devices/system/xen_memory/xen_memory0/retry_count
+Date:           May 2011
+KernelVersion:  2.6.39
+Contact:        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Description:
+                The current number of times that the balloon driver
+                has attempted to increase the size of the balloon.
+                The default value is one. With max_retry_count being
+                zero (unlimited), this means that the driver will attempt
+                to retry with a 'schedule_delay' delay.
+
+What:           /sys/devices/system/xen_memory/xen_memory0/schedule_delay
+Date:           May 2011
+KernelVersion:  2.6.39
+Contact:        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Description:
+                The time (in seconds) to wait between attempts to
+                increase the balloon.  Each time the balloon cannot be
+                increased, 'schedule_delay' is increased (until
+                'max_schedule_delay' is reached at which point it
+                will use the max value).
+
+What:           /sys/devices/system/xen_memory/xen_memory0/target
+Date:           April 2008
+KernelVersion:  2.6.26
+Contact:        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Description:
+                The target number of pages to adjust this domain's
+                memory reservation to.
+
+What:           /sys/devices/system/xen_memory/xen_memory0/target_kb
+Date:           April 2008
+KernelVersion:  2.6.26
+Contact:        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Description:
+                As target above, except the value is in KiB.
+
+What:           /sys/devices/system/xen_memory/xen_memory0/info/current_kb
+Date:           April 2008
+KernelVersion:  2.6.26
+Contact:        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Description:
+                Current size (in KiB) of this domain's memory
+                reservation.
+
+What:           /sys/devices/system/xen_memory/xen_memory0/info/high_kb
+Date:           April 2008
+KernelVersion:  2.6.26
+Contact:        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Description:
+                Amount (in KiB) of high memory in the balloon.
+
+What:           /sys/devices/system/xen_memory/xen_memory0/info/low_kb
+Date:           April 2008
+KernelVersion:  2.6.26
+Contact:        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Description:
+                Amount (in KiB) of low (or normal) memory in the
+                balloon.
diff --git a/Documentation/ABI/testing/sysfs-bus-pci b/Documentation/ABI/testing/sysfs-bus-pci
index 349ecf26ce10..34f51100f029 100644
--- a/Documentation/ABI/testing/sysfs-bus-pci
+++ b/Documentation/ABI/testing/sysfs-bus-pci
@@ -66,6 +66,24 @@ Description:
                 re-discover previously removed devices.
                 Depends on CONFIG_HOTPLUG.
 
+What:           /sys/bus/pci/devices/.../msi_irqs/
+Date:           September, 2011
+Contact:        Neil Horman <nhorman@tuxdriver.com>
+Description:
+                The /sys/devices/.../msi_irqs directory contains a variable set
+                of sub-directories, with each sub-directory being named after a
+                corresponding msi irq vector allocated to that device.  Each
+                numbered sub-directory N contains attributes of that irq.
+                Note that this directory is not created for device drivers which
+                do not support msi irqs
+
+What:           /sys/bus/pci/devices/.../msi_irqs/<N>/mode
+Date:           September 2011
+Contact:        Neil Horman <nhorman@tuxdriver.com>
+Description:
+                This attribute indicates the mode that the irq vector named by
+                the parent directory is in (msi vs. msix)
+
 What:           /sys/bus/pci/devices/.../remove
 Date:           January 2009
 Contact:        Linux PCI developers <linux-pci@vger.kernel.org>
diff --git a/Documentation/ABI/testing/sysfs-bus-usb b/Documentation/ABI/testing/sysfs-bus-usb
index e647378e9e88..b4f548792e32 100644
--- a/Documentation/ABI/testing/sysfs-bus-usb
+++ b/Documentation/ABI/testing/sysfs-bus-usb
@@ -119,6 +119,31 @@ Description:
                 Write a 1 to force the device to disconnect
                 (equivalent to unplugging a wired USB device).
 
+What:           /sys/bus/usb/drivers/.../new_id
+Date:           October 2011
+Contact:        linux-usb@vger.kernel.org
+Description:
+                Writing a device ID to this file will attempt to
+                dynamically add a new device ID to a USB device driver.
+                This may allow the driver to support more hardware than
+                was included in the driver's static device ID support
+                table at compile time. The format for the device ID is:
+                idVendor idProduct bInterfaceClass.
+                The vendor ID and device ID fields are required, the
+                interface class is optional.
+                Upon successfully adding an ID, the driver will probe
+                for the device and attempt to bind to it.  For example:
+                # echo "8086 10f5" > /sys/bus/usb/drivers/foo/new_id
+
+What:           /sys/bus/usb-serial/drivers/.../new_id
+Date:           October 2011
+Contact:        linux-usb@vger.kernel.org
+Description:
+                For serial USB drivers, this attribute appears under the
+                extra bus folder "usb-serial" in sysfs; apart from that
+                difference, all descriptions from the entry
+                "/sys/bus/usb/drivers/.../new_id" apply.
+
 What:           /sys/bus/usb/drivers/.../remove_id
 Date:           November 2009
 Contact:        CHENG Renquan <rqcheng@smu.edu.sg>
diff --git a/Documentation/ABI/testing/sysfs-class-rtc-rtc0-device-rtc_calibration b/Documentation/ABI/testing/sysfs-class-rtc-rtc0-device-rtc_calibration
new file mode 100644
index 000000000000..4cf1e72222d9
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-class-rtc-rtc0-device-rtc_calibration
@@ -0,0 +1,12 @@
+What:           Attribute for calibrating ST-Ericsson AB8500 Real Time Clock
+Date:           Oct 2011
+KernelVersion:  3.0
+Contact:        Mark Godfrey <mark.godfrey@stericsson.com>
+Description:    The rtc_calibration attribute allows the userspace to
+                calibrate the AB8500.s 32KHz Real Time Clock.
+                Every 60 seconds the AB8500 will correct the RTC's value
+                by adding to it the value of this attribute.
+                The range of the attribute is -127 to +127 in units of
+                30.5 micro-seconds (half-parts-per-million of the 32KHz clock)
+Users:          The /vendor/st-ericsson/base_utilities/core/rtc_calibration
+                daemon uses this interface.
diff --git a/Documentation/ABI/testing/sysfs-devices-platform-docg3 b/Documentation/ABI/testing/sysfs-devices-platform-docg3
new file mode 100644
index 000000000000..8aa36716882f
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-devices-platform-docg3
@@ -0,0 +1,34 @@
+What:           /sys/devices/platform/docg3/f[0-3]_dps[01]_is_keylocked
+Date:           November 2011
+KernelVersion:  3.3
+Contact:        Robert Jarzmik <robert.jarzmik@free.fr>
+Description:
+                Show whether the floor (0 to 4), protection area (0 or 1) is
+                keylocked. Each docg3 chip (or floor) has 2 protection areas,
+                which can cover any part of it, block aligned, called DPS.
+                The protection has information embedded whether it blocks reads,
+                writes or both.
+                The result is:
+                0 -> the DPS is not keylocked
+                1 -> the DPS is keylocked
+Users:          None identified so far.
+
+What:           /sys/devices/platform/docg3/f[0-3]_dps[01]_protection_key
+Date:           November 2011
+KernelVersion:  3.3
+Contact:        Robert Jarzmik <robert.jarzmik@free.fr>
+Description:
+                Enter the protection key for the floor (0 to 4), protection area
+                (0 or 1). Each docg3 chip (or floor) has 2 protection areas,
+                which can cover any part of it, block aligned, called DPS.
+                The protection has information embedded whether it blocks reads,
+                writes or both.
+                The protection key is a string of 8 bytes (value 0-255).
+                Entering the correct value toggle the lock, and can be observed
+                through f[0-3]_dps[01]_is_keylocked.
+                Possible values are:
+                        - 8 bytes
+                Typical values are:
+                        - "00000000"
+                        - "12345678"
+Users:          None identified so far.
diff --git a/Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff b/Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff
index 9aec8ef228b0..167d9032b970 100644
--- a/Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff
+++ b/Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff
@@ -1,7 +1,7 @@
 What:           /sys/module/hid_logitech/drivers/hid:logitech/<dev>/range.
 Date:           July 2011
 KernelVersion:  3.2
-Contact:        Michal Malý <madcatxster@gmail.com>
+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-driver-hid-multitouch b/Documentation/ABI/testing/sysfs-driver-hid-multitouch
new file mode 100644
index 000000000000..f79839d1af37
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-driver-hid-multitouch
@@ -0,0 +1,9 @@
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/quirks
+Date:           November 2011
+Contact:        Benjamin Tissoires <benjamin.tissoires@gmail.com>
+Description:    The integer value of this attribute corresponds to the
+                quirks actually in place to handle the device's protocol.
+                When read, this attribute returns the current settings (see
+                MT_QUIRKS_* in hid-multitouch.c).
+                When written this attribute change on the fly the quirks, then
+                the protocol to handle the device.
diff --git a/Documentation/ABI/testing/sysfs-driver-hid-roccat-isku b/Documentation/ABI/testing/sysfs-driver-hid-roccat-isku
new file mode 100644
index 000000000000..189dc43891bf
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-driver-hid-roccat-isku
@@ -0,0 +1,135 @@
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/actual_profile
+Date:           June 2011
+Contact:        Stefan Achatz <erazor_de@users.sourceforge.net>
+Description:    The integer value of this attribute ranges from 0-4.
+                When read, this attribute returns the number of the actual
+                profile. This value is persistent, so its equivalent to the
+                profile that's active when the device is powered on next time.
+                When written, this file sets the number of the startup profile
+                and the device activates this profile immediately.
+Users:          http://roccat.sourceforge.net
+
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/info
+Date:           June 2011
+Contact:        Stefan Achatz <erazor_de@users.sourceforge.net>
+Description:    When read, this file returns general data like firmware version.
+                The data is 6 bytes long.
+                This file is readonly.
+Users:          http://roccat.sourceforge.net
+
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/key_mask
+Date:           June 2011
+Contact:        Stefan Achatz <erazor_de@users.sourceforge.net>
+Description:    When written, this file lets one deactivate certain keys like
+                windows and application keys, to prevent accidental presses.
+                Profile number for which this settings occur is included in
+                written data. The data has to be 6 bytes long.
+                Before reading this file, control has to be written to select
+                which profile to read.
+Users:          http://roccat.sourceforge.net
+
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/keys_capslock
+Date:           June 2011
+Contact:        Stefan Achatz <erazor_de@users.sourceforge.net>
+Description:    When written, this file lets one set the function of the
+                capslock key for a specific profile. Profile number is included
+                in written data. The data has to be 6 bytes long.
+                Before reading this file, control has to be written to select
+                which profile to read.
+Users:          http://roccat.sourceforge.net
+
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/keys_easyzone
+Date:           June 2011
+Contact:        Stefan Achatz <erazor_de@users.sourceforge.net>
+Description:    When written, this file lets one set the function of the
+                easyzone keys for a specific profile. Profile number is included
+                in written data. The data has to be 65 bytes long.
+                Before reading this file, control has to be written to select
+                which profile to read.
+Users:          http://roccat.sourceforge.net
+
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/keys_function
+Date:           June 2011
+Contact:        Stefan Achatz <erazor_de@users.sourceforge.net>
+Description:    When written, this file lets one set the function of the
+                function keys for a specific profile. Profile number is included
+                in written data. The data has to be 41 bytes long.
+                Before reading this file, control has to be written to select
+                which profile to read.
+Users:          http://roccat.sourceforge.net
+
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/keys_macro
+Date:           June 2011
+Contact:        Stefan Achatz <erazor_de@users.sourceforge.net>
+Description:    When written, this file lets one set the function of the macro
+                keys for a specific profile. Profile number is included in
+                written data. The data has to be 35 bytes long.
+                Before reading this file, control has to be written to select
+                which profile to read.
+Users:          http://roccat.sourceforge.net
+
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/keys_media
+Date:           June 2011
+Contact:        Stefan Achatz <erazor_de@users.sourceforge.net>
+Description:    When written, this file lets one set the function of the media
+                keys for a specific profile. Profile number is included in
+                written data. The data has to be 29 bytes long.
+                Before reading this file, control has to be written to select
+                which profile to read.
+Users:          http://roccat.sourceforge.net
+
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/keys_thumbster
+Date:           June 2011
+Contact:        Stefan Achatz <erazor_de@users.sourceforge.net>
+Description:    When written, this file lets one set the function of the
+                thumbster keys for a specific profile. Profile number is included
+                in written data. The data has to be 23 bytes long.
+                Before reading this file, control has to be written to select
+                which profile to read.
+Users:          http://roccat.sourceforge.net
+
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/last_set
+Date:           June 2011
+Contact:        Stefan Achatz <erazor_de@users.sourceforge.net>
+Description:    When written, this file lets one set the time in secs since
+                epoch in which the last configuration took place.
+                The data has to be 20 bytes long.
+Users:          http://roccat.sourceforge.net
+
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/light
+Date:           June 2011
+Contact:        Stefan Achatz <erazor_de@users.sourceforge.net>
+Description:    When written, this file lets one set the backlight intensity for
+                a specific profile. Profile number is included in written data.
+                The data has to be 10 bytes long.
+                Before reading this file, control has to be written to select
+                which profile to read.
+Users:          http://roccat.sourceforge.net
+
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/macro
+Date:           June 2011
+Contact:        Stefan Achatz <erazor_de@users.sourceforge.net>
+Description:    When written, this file lets one store macros with max 500
+                keystrokes for a specific button for a specific profile.
+                Button and profile numbers are included in written data.
+                The data has to be 2083 bytes long.
+                Before reading this file, control has to be written to select
+                which profile and key to read.
+Users:          http://roccat.sourceforge.net
+
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/control
+Date:           June 2011
+Contact:        Stefan Achatz <erazor_de@users.sourceforge.net>
+Description:    When written, this file lets one select which data from which
+                profile will be read next. The data has to be 3 bytes long.
+                This file is writeonly.
+Users:          http://roccat.sourceforge.net
+
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/talk
+Date:           June 2011
+Contact:        Stefan Achatz <erazor_de@users.sourceforge.net>
+Description:    When written, this file lets one trigger easyshift functionality
+                from the host.
+                The data has to be 16 bytes long.
+                This file is writeonly.
+Users:          http://roccat.sourceforge.net
diff --git a/Documentation/ABI/testing/sysfs-driver-hid-wiimote b/Documentation/ABI/testing/sysfs-driver-hid-wiimote
index 5d5a16ea57c6..3d98009f447a 100644
--- a/Documentation/ABI/testing/sysfs-driver-hid-wiimote
+++ b/Documentation/ABI/testing/sysfs-driver-hid-wiimote
@@ -8,3 +8,15 @@ Contact:	David Herrmann <dh.herrmann@googlemail.com>
 Description:    Make it possible to set/get current led state. Reading from it
                 returns 0 if led is off and 1 if it is on. Writing 0 to it
                 disables the led, writing 1 enables it.
+
+What:           /sys/bus/hid/drivers/wiimote/<dev>/extension
+Date:           August 2011
+KernelVersion:  3.2
+Contact:        David Herrmann <dh.herrmann@googlemail.com>
+Description:    This file contains the currently connected and initialized
+                extensions. It can be one of: none, motionp, nunchuck, classic,
+                motionp+nunchuck, motionp+classic
+                motionp is the official Nintendo Motion+ extension, nunchuck is
+                the official Nintendo Nunchuck extension and classic is the
+                Nintendo Classic Controller extension. The motionp extension can
+                be combined with the other two.
diff --git a/Documentation/ABI/testing/sysfs-driver-wacom b/Documentation/ABI/testing/sysfs-driver-wacom
index 82d4df136444..0130d6683c14 100644
--- a/Documentation/ABI/testing/sysfs-driver-wacom
+++ b/Documentation/ABI/testing/sysfs-driver-wacom
@@ -15,9 +15,9 @@ Contact:	linux-input@vger.kernel.org
 Description:
                 Attribute group for control of the status LEDs and the OLEDs.
                 This attribute group is only available for Intuos 4 M, L,
-                and XL (with LEDs and OLEDs) and Cintiq 21UX2 (LEDs only).
-                Therefore its presence implicitly signifies the presence of
-                said LEDs and OLEDs on the tablet device.
+                and XL (with LEDs and OLEDs) and Cintiq 21UX2 and Cintiq 24HD
+                (LEDs only). Therefore its presence implicitly signifies the
+                presence of said LEDs and OLEDs on the tablet device.
 
 What:           /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status0_luminance
 Date:           August 2011
@@ -41,16 +41,17 @@ Date:		August 2011
 Contact:        linux-input@vger.kernel.org
 Description:
                 Writing to this file sets which one of the four (for Intuos 4)
-                or of the right four (for Cintiq 21UX2) status LEDs is active (0..3).
-                The other three LEDs on the same side are always inactive.
+                or of the right four (for Cintiq 21UX2 and Cintiq 24HD) status
+                LEDs is active (0..3). The other three LEDs on the same side are
+                always inactive.
 
 What:           /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status_led1_select
 Date:           September 2011
 Contact:        linux-input@vger.kernel.org
 Description:
-                Writing to this file sets which one of the left four (for Cintiq 21UX2)
-                status LEDs is active (0..3). The other three LEDs on the left are always
-                inactive.
+                Writing to this file sets which one of the left four (for Cintiq 21UX2
+                and Cintiq 24HD) status LEDs is active (0..3). The other three LEDs on
+                the left are always inactive.
 
 What:           /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/buttons_luminance
 Date:           August 2011
diff --git a/Documentation/ABI/testing/sysfs-kernel-slab b/Documentation/ABI/testing/sysfs-kernel-slab
index 8b093f8222d3..91bd6ca5440f 100644
--- a/Documentation/ABI/testing/sysfs-kernel-slab
+++ b/Documentation/ABI/testing/sysfs-kernel-slab
@@ -346,6 +346,10 @@ Description:
                 number of objects per slab.  If a slab cannot be allocated
                 because of fragmentation, SLUB will retry with the minimum order
                 possible depending on its characteristics.
+                When debug_guardpage_minorder=N (N > 0) parameter is specified
+                (see Documentation/kernel-parameters.txt), the minimum possible
+                order is used and this sysfs entry can not be used to change
+                the order at run time.
 
 What:           /sys/kernel/slab/cache/order_fallback
 Date:           April 2008
diff --git a/Documentation/ABI/testing/sysfs-module b/Documentation/ABI/testing/sysfs-module
index 9489ea8e294c..47064c2b1f79 100644
--- a/Documentation/ABI/testing/sysfs-module
+++ b/Documentation/ABI/testing/sysfs-module
@@ -33,3 +33,19 @@ Description:	Maximum time allowed for periodic transfers per microframe (μs)
                 Beware, non-standard modes are usually not thoroughly tested by
                 hardware designers, and the hardware can malfunction when this
                 setting differ from default 100.
+
+What:           /sys/module/*/{coresize,initsize}
+Date:           Jan 2012
+KernelVersion:»·3.3
+Contact:        Kay Sievers <kay.sievers@vrfy.org>
+Description:    Module size in bytes.
+
+What:           /sys/module/*/taint
+Date:           Jan 2012
+KernelVersion:»·3.3
+Contact:        Kay Sievers <kay.sievers@vrfy.org>
+Description:    Module taint flags:
+                        P - proprietary module
+                        O - out-of-tree module
+                        F - force-loaded module
+                        C - staging driver module