---

yaml
---
r: 287347
b: refs/heads/master
c: 48cfe37
h: refs/heads/master
i:
  287345: 6751ee1
  287343: 594ea27
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d39aa1b998fffd481517c1dd03d83c38e1706f9
+refs/heads/master: 48cfe37cc03f616e6c139796962e7ec677cde8a9

trunk/CREDITS

@@ -514,11 +514,6 @@ S: Bessemerstraat 21
 S: Amsterdam
 S: The Netherlands
 
-N: NeilBrown
-E: neil@brown.name
-P: 4096R/566281B9 1BC6 29EB D390 D870 7B5F  497A 39EC 9EDD 5662 81B9
-D: NFSD Maintainer 2000-2007
-
 N: Zach Brown
 E: zab@zabbo.net
 D: maestro pci sound

trunk/Documentation/ABI/testing/sysfs-bus-pci

@@ -66,24 +66,6 @@ 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>

trunk/Documentation/ABI/testing/sysfs-bus-rbd

@@ -57,6 +57,13 @@ 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

trunk/Documentation/ABI/testing/sysfs-bus-usb

@@ -119,31 +119,6 @@ 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>

trunk/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.