Merge tag 'omap-pm-v3.10/cleanup/cpuidle-v2' of... (5b4bdac9) · Commits · EulixOS / Software / Kernel

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.

Documentation/ABI/testing/sysfs-firmware-acpi

+26 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,32 @@ Description:
		yoffset: The number of pixels between the top of the screen
		and the top edge of the image.

		What: /sys/firmware/acpi/hotplug/
		Date: February 2013
		Contact: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
		Description:
		There are separate hotplug profiles for different classes of
		devices supported by ACPI, such as containers, memory modules,
		processors, PCI root bridges etc. A hotplug profile for a given
		class of devices is a collection of settings defining the way
		that class of devices will be handled by the ACPI core hotplug
		code. Those profiles are represented in sysfs as subdirectories
		of /sys/firmware/acpi/hotplug/.

		The following setting is available to user space for each
		hotplug profile:

		enabled: If set, the ACPI core will handle notifications of
		hotplug events associated with the given class of
		devices and will allow those devices to be ejected with
		the help of the _EJ0 control method. Unsetting it
		effectively disables hotplug for the correspoinding
		class of devices.

		The value of the above attribute is an integer number: 1 (set)
		or 0 (unset). Attempts to write any other values to it will
		cause -EINVAL to be returned.

		What: /sys/firmware/acpi/interrupts/
		Date: February 2008
		Contact: Len Brown <lenb@kernel.org>

Documentation/sound/alsa/ALSA-Configuration.txt

+2 −3

Original line number	Diff line number	Diff line
		@@ -890,9 +890,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
		enable_msi - Enable Message Signaled Interrupt (MSI) (default = off)
		power_save - Automatic power-saving timeout (in second, 0 =
		disable)
		power_save_controller - Support runtime D3 of HD-audio controller
		(-1 = on for supported chip (default), false = off,
		true = force to on even for unsupported hardware)
		power_save_controller - Reset HD-audio controller in power-saving mode
		(default = on)
		align_buffer_size - Force rounding of buffer/period sizes to multiples
		of 128 bytes. This is more efficient in terms of memory
		access but isn't required by the HDA spec and prevents

MAINTAINERS

+2 −2

Original line number	Diff line number	Diff line
		@@ -5065,9 +5065,8 @@ S: Maintained
		F: drivers/net/ethernet/marvell/sk*

		MARVELL LIBERTAS WIRELESS DRIVER
		M: Dan Williams <dcbw@redhat.com>
		L: libertas-dev@lists.infradead.org
		S: Maintained
		S: Orphan
		F: drivers/net/wireless/libertas/

		MARVELL MV643XX ETHERNET DRIVER
		@@ -5569,6 +5568,7 @@ F: include/uapi/linux/if_*
		F: include/uapi/linux/netdevice.h

		NETXEN (1/10) GbE SUPPORT
		M: Manish Chopra <manish.chopra@qlogic.com>
		M: Sony Chacko <sony.chacko@qlogic.com>
		M: Rajesh Borundia <rajesh.borundia@qlogic.com>
		L: netdev@vger.kernel.org

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 3
		PATCHLEVEL = 9
		SUBLEVEL = 0
		EXTRAVERSION = -rc5
		EXTRAVERSION = -rc6
		NAME = Unicycling Gorilla

		# DOCUMENTATION