Merge commit 'v3.4-rc4' into next (57b8628b) · Commits · e / devices / android_kernel_sony_msm8994

Documentation/00-INDEX

+4 −2

Original line number	Diff line number	Diff line
		@@ -7,8 +7,8 @@ Please try and keep the descriptions small enough to fit on one line.

		Following translations are available on the WWW:

		- Japanese, maintained by the JF Project (JF@linux.or.jp), at
		http://www.linux.or.jp/JF/
		- Japanese, maintained by the JF Project (jf@listserv.linux.or.jp), at
		http://linuxjf.sourceforge.jp/

		00-INDEX
		- this file.
		@@ -104,6 +104,8 @@ cpuidle/
		- info on CPU_IDLE, CPU idle state management subsystem.
		cputopology.txt
		- documentation on how CPU topology info is exported via sysfs.
		crc32.txt
		- brief tutorial on CRC computation
		cris/
		- directory with info about Linux on CRIS architecture.
		crypto/

Documentation/ABI/obsolete/sysfs-class-rfkill

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ Date: 09-Jul-2007
		KernelVersion v2.6.22
		Contact: linux-wireless@vger.kernel.org
		Description: Current state of the transmitter.
		This file is deprecated and sheduled to be removed in 2014,
		This file is deprecated and scheduled to be removed in 2014,
		because its not possible to express the 'soft and hard block'
		state of the rfkill driver.
		Values: A numeric value.

Documentation/ABI/removed/devfs

+1 −1

Original line number	Diff line number	Diff line
		What: devfs
		Date: July 2005 (scheduled), finally removed in kernel v2.6.18
		Contact: Greg Kroah-Hartman <gregkh@suse.de>
		Contact: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
		Description:
		devfs has been unmaintained for a number of years, has unfixable
		races, contains a naming policy within the kernel that is

Documentation/ABI/stable/sysfs-driver-usb-usbtmc

+13 −13

Original line number	Diff line number	Diff line
		What: /sys/bus/usb/drivers/usbtmc/devices/*/interface_capabilities
		What: /sys/bus/usb/drivers/usbtmc/devices/*/device_capabilities
		What: /sys/bus/usb/drivers/usbtmc/*/interface_capabilities
		What: /sys/bus/usb/drivers/usbtmc/*/device_capabilities
		Date: August 2008
		Contact: Greg Kroah-Hartman <gregkh@suse.de>
		Contact: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
		Description:
		These files show the various USB TMC capabilities as described
		by the device itself. The full description of the bitfields
		@@ -12,10 +12,10 @@ Description:
		The files are read only.


		What: /sys/bus/usb/drivers/usbtmc/devices/*/usb488_interface_capabilities
		What: /sys/bus/usb/drivers/usbtmc/devices/*/usb488_device_capabilities
		What: /sys/bus/usb/drivers/usbtmc/*/usb488_interface_capabilities
		What: /sys/bus/usb/drivers/usbtmc/*/usb488_device_capabilities
		Date: August 2008
		Contact: Greg Kroah-Hartman <gregkh@suse.de>
		Contact: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
		Description:
		These files show the various USB TMC capabilities as described
		by the device itself. The full description of the bitfields
		@@ -27,9 +27,9 @@ Description:
		The files are read only.


		What: /sys/bus/usb/drivers/usbtmc/devices/*/TermChar
		What: /sys/bus/usb/drivers/usbtmc/*/TermChar
		Date: August 2008
		Contact: Greg Kroah-Hartman <gregkh@suse.de>
		Contact: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
		Description:
		This file is the TermChar value to be sent to the USB TMC
		device as described by the document, "Universal Serial Bus Test
		@@ -40,9 +40,9 @@ Description:
		sent to the device or not.


		What: /sys/bus/usb/drivers/usbtmc/devices/*/TermCharEnabled
		What: /sys/bus/usb/drivers/usbtmc/*/TermCharEnabled
		Date: August 2008
		Contact: Greg Kroah-Hartman <gregkh@suse.de>
		Contact: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
		Description:
		This file determines if the TermChar is to be sent to the
		device on every transaction or not. For more details about
		@@ -51,11 +51,11 @@ Description:
		published by the USB-IF.


		What: /sys/bus/usb/drivers/usbtmc/devices/*/auto_abort
		What: /sys/bus/usb/drivers/usbtmc/*/auto_abort
		Date: August 2008
		Contact: Greg Kroah-Hartman <gregkh@suse.de>
		Contact: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
		Description:
		This file determines if the the transaction of the USB TMC
		This file determines if the transaction of the USB TMC
		device is to be automatically aborted if there is any error.
		For more details about this, please see the document,
		"Universal Serial Bus Test and Measurement Class Specification

Documentation/ABI/stable/sysfs-module

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ Description:
		The name of the module that is in the kernel. This
		module name will show up either if the module is built
		directly into the kernel, or if it is loaded as a
		dyanmic module.
		dynamic module.

		/sys/module/MODULENAME/parameters
		This directory contains individual files that are each