---

yaml
---
r: 374615
b: refs/heads/master
c: 30fb980
h: refs/heads/master
i:
  374613: e79f765
  374611: 63c63e7
  374607: cf43b04
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b29bdba51924f6fd5971352ba111784dee3a5853
+refs/heads/master: 30fb980b99d3896bd891e56fec22191d40007efc

trunk/CREDITS

@@ -761,10 +761,6 @@ S: Northampton
 S: NN1 3QT
 S: United Kingdom
 
-N: Massimo Dal Zotto
-E: dz@debian.org
-D: i8k Dell laptop SMM driver
-
 N: Uwe Dannowski
 E: Uwe.Dannowski@ira.uka.de
 W: http://i30www.ira.uka.de/~dannowsk/

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

@@ -66,7 +66,27 @@ current_snap
 
 	The current snapshot for which the device is mapped.
 
+snap_*
+
+	A directory per each snapshot
+
 parent
 
 	Information identifying the pool, image, and snapshot id for
 	the parent image in a layered rbd image (format 2 only).
+
+Entries under /sys/bus/rbd/devices/<dev-id>/snap_<snap-name>
+-------------------------------------------------------------
+
+snap_id
+
+	The rados internal snapshot id assigned for this snapshot
+
+snap_size
+
+	The size of the image when this snapshot was taken.
+
+snap_features
+
+	A hexadecimal encoding of the feature bits for this snapshot.
+

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

@@ -32,7 +32,7 @@ Date:		January 2008
 KernelVersion:	2.6.25
 Contact:	Sarah Sharp <sarah.a.sharp@intel.com>
 Description:
-		If CONFIG_PM_RUNTIME is enabled then this file
+		If CONFIG_PM and CONFIG_USB_SUSPEND are enabled, then this file
 		is present.  When read, it returns the total time (in msec)
 		that the USB device has been connected to the machine.  This
 		file is read-only.
@@ -45,7 +45,7 @@ Date:		January 2008
 KernelVersion:	2.6.25
 Contact:	Sarah Sharp <sarah.a.sharp@intel.com>
 Description:
-		If CONFIG_PM_RUNTIME is enabled then this file
+		If CONFIG_PM and CONFIG_USB_SUSPEND are enabled, then this file
 		is present.  When read, it returns the total time (in msec)
 		that the USB device has been active, i.e. not in a suspended
 		state.  This file is read-only.
@@ -187,7 +187,7 @@ What:		/sys/bus/usb/devices/.../power/usb2_hardware_lpm
 Date:		September 2011
 Contact:	Andiry Xu <andiry.xu@amd.com>
 Description:
-		If CONFIG_PM_RUNTIME is set and a USB 2.0 lpm-capable device
+		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

trunk/Documentation/ABI/testing/sysfs-class-net-mesh

@@ -67,14 +67,6 @@ 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/network_coding
-Date:           Nov 2012
-Contact:        Martin Hundeboll <martin@hundeboll.net>
-Description:
-                Controls whether Network Coding (using some magic
-                to send fewer wifi packets but still the same
-                content) is enabled or not.
-
 What:           /sys/class/net/<mesh_iface>/mesh/orig_interval
 Date:           May 2010
 Contact:        Marek Lindner <lindner_marek@yahoo.de>

trunk/Documentation/ABI/testing/sysfs-devices-system-cpu

@@ -173,15 +173,3 @@ Description:	Processor frequency boosting control
 		Boosting allows the CPU and the firmware to run at a frequency
 		beyound it's nominal limit.
 		More details can be found in Documentation/cpu-freq/boost.txt
-
-
-What:		/sys/devices/system/cpu/cpu#/crash_notes
-		/sys/devices/system/cpu/cpu#/crash_notes_size
-Date:		April 2013
-Contact:	kexec@lists.infradead.org
-Description:	address and size of the percpu note.
-
-		crash_notes: the physical address of the memory that holds the
-		note of cpu#.
-
-		crash_notes_size: size of the note of cpu#.

trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-isku

@@ -101,8 +101,7 @@ 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 for Isku, IskuFX needs	16 bytes
-		of 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
@@ -142,12 +141,3 @@ Description:	When written, this file lets one trigger easyshift functionality
 		The data has to be 16 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>/talkfx
-Date:		February 2013
-Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
-Description:	When written, this file lets one trigger temporary color schemes
-		from the host.
-		The data has to be 16 bytes long.
-		This file is writeonly.
-Users:		http://roccat.sourceforge.net