3 files changed, 26 insertions, 8 deletions

diff --git a/Documentation/ABI/testing/sysfs-bus-rbd b/Documentation/ABI/testing/sysfs-bus-rbd
index fa72ccb2282e..dbedafb095e2 100644
--- a/Documentation/ABI/testing/sysfs-bus-rbd
+++ b/Documentation/ABI/testing/sysfs-bus-rbd
@@ -57,13 +57,6 @@ create_snap
 
          $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_create
 
-rollback_snap
-
-        Rolls back data to the specified snapshot. This goes over the entire
-        list of rados blocks and sends a rollback command to each.
-
-         $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_rollback
-
 snap_*
 
         A directory per each snapshot
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-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.