Merge branch 'linus' into core/urgent (f99e44a7) · Commits · 方亚芬 / linux

CREDITS

+4 −0

Original line number	Diff line number	Diff line
		@@ -761,6 +761,10 @@ 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/

Documentation/ABI/testing/sysfs-bus-mei

0 → 100644

+7 −0

Original line number	Diff line number	Diff line
		What: /sys/bus/mei/devices/.../modalias
		Date: March 2013
		KernelVersion: 3.10
		Contact: Samuel Ortiz <sameo@linux.intel.com>
		linux-mei@linux.intel.com
		Description: Stores the same MODALIAS value emitted by uevent
		Format: mei:<mei device name>

Documentation/ABI/testing/sysfs-bus-usb

+3 −3

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ Date: January 2008
		KernelVersion: 2.6.25
		Contact: Sarah Sharp <sarah.a.sharp@intel.com>
		Description:
		If CONFIG_PM and CONFIG_USB_SUSPEND are enabled, then this file
		If CONFIG_PM_RUNTIME is 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 and CONFIG_USB_SUSPEND are enabled, then this file
		If CONFIG_PM_RUNTIME is 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_USB_SUSPEND is set and a USB 2.0 lpm-capable device
		If CONFIG_PM_RUNTIME 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

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,14 @@ 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>

Documentation/ABI/testing/sysfs-devices-lpss_ltr

0 → 100644

+44 −0

Original line number	Diff line number	Diff line
		What: /sys/devices/.../lpss_ltr/
		Date: March 2013
		Contact: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
		Description:
		The /sys/devices/.../lpss_ltr/ directory is only present for
		devices included into the Intel Lynxpoint Low Power Subsystem
		(LPSS). If present, it contains attributes containing the LTR
		mode and the values of LTR registers of the device.

		What: /sys/devices/.../lpss_ltr/ltr_mode
		Date: March 2013
		Contact: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
		Description:
		The /sys/devices/.../lpss_ltr/ltr_mode attribute contains an
		integer number (0 or 1) indicating whether or not the devices'
		LTR functionality is working in the software mode (1).

		This attribute is read-only. If the device's runtime PM status
		is not "active", attempts to read from this attribute cause
		-EAGAIN to be returned.

		What: /sys/devices/.../lpss_ltr/auto_ltr
		Date: March 2013
		Contact: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
		Description:
		The /sys/devices/.../lpss_ltr/auto_ltr attribute contains the
		current value of the device's AUTO_LTR register (raw)
		represented as an 8-digit hexadecimal number.

		This attribute is read-only. If the device's runtime PM status
		is not "active", attempts to read from this attribute cause
		-EAGAIN to be returned.

		What: /sys/devices/.../lpss_ltr/sw_ltr
		Date: March 2013
		Contact: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
		Description:
		The /sys/devices/.../lpss_ltr/auto_ltr attribute contains the
		current value of the device's SW_LTR register (raw) represented
		as an 8-digit hexadecimal number.

		This attribute is read-only. If the device's runtime PM status
		is not "active", attempts to read from this attribute cause
		-EAGAIN to be returned.