Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 954f9ac4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 



There's a Niagara 2 memcpy fix in this tree and I have
a Kconfig fix from Dave Jones which requires the sparc-next
changes which went upstream yesterday.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1b62ca7b 7fe0b14b

Documentation/ABI/testing/sysfs-bus-usb

+7 −0
Original line number Diff line number Diff line
@@ -220,3 +220,10 @@ Description: 
		If the device doesn't support LTM, the file will read "no".

		The file will be present for all speeds of USB devices, and will

		always read "no" for USB 1.1 and USB 2.0 devices.



What:		/sys/bus/usb/devices/.../(hub interface)/portX

Date:		August 2012

Contact:	Lan Tianyu <tianyu.lan@intel.com>

Description:

		The /sys/bus/usb/devices/.../(hub interface)/portX

		is usb port device's sysfs directory.

Documentation/ABI/testing/sysfs-class-extcon

+11 −11
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ Description: 
		accessory cables have such capability. For example,

		the 30-pin port of Nuri board (/arch/arm/mach-exynos)

		may have both HDMI and Charger attached, or analog audio,

		video, and USB cables attached simulteneously.

		video, and USB cables attached simultaneously.



		If there are cables mutually exclusive with each other,

		such binary relations may be expressed with extcon_dev's
@@ -35,7 +35,7 @@ Description: 
		The /sys/class/extcon/.../state shows and stores the cable

		attach/detach information of the corresponding extcon object.

		If the extcon object has an optional callback "show_state"

		defined, the showing function is overriden with the optional

		defined, the showing function is overridden with the optional

		callback.



		If the default callback for showing function is used, the
@@ -46,19 +46,19 @@ Description: 
		TA=1

		EAR_JACK=0

		#

		In this example, the extcon device have USB_OTG and TA

		In this example, the extcon device has USB_OTG and TA

		cables attached and HDMI and EAR_JACK cables detached.



		In order to update the state of an extcon device, enter a hex

		state number starting with 0x.

		 echo 0xHEX > state

		state number starting with 0x:

		# echo 0xHEX > state



		This updates the whole state of the extcon dev.

		This updates the whole state of the extcon device.

		Inputs of all the methods are required to meet the

		mutually_exclusive contidions if they exist.

		mutually_exclusive conditions if they exist.



		It is recommended to use this "global" state interface if

		you need to enter the value atomically. The later state

		you need to set the value atomically. The later state

		interface associated with each cable cannot update

		multiple cable states of an extcon device simultaneously.
@@ -73,7 +73,7 @@ What: /sys/class/extcon/.../cable.x/state 
Date:		February 2012

Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>

Description:

		The /sys/class/extcon/.../cable.x/name shows and stores the

		The /sys/class/extcon/.../cable.x/state shows and stores the

		state of cable "x" (integer between 0 and 31) of an extcon

		device. The state value is either 0 (detached) or 1

		(attached).
@@ -83,8 +83,8 @@ Date: December 2011 
Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>

Description:

		Shows the relations of mutually exclusiveness. For example,

		if the mutually_exclusive array of extcon_dev is

		{0x3, 0x5, 0xC, 0x0}, the, the output is:

		if the mutually_exclusive array of extcon device is

		{0x3, 0x5, 0xC, 0x0}, then the output is:

		# ls mutually_exclusive/

		0x3

		0x5

Documentation/ABI/testing/sysfs-class-regulator

+21 −0
Original line number Diff line number Diff line
@@ -349,3 +349,24 @@ Description: 


		This will be one of the same strings reported by

		the "state" attribute.



What:		/sys/class/regulator/.../bypass

Date:		September 2012

KernelVersion:	3.7

Contact:	Mark Brown <broonie@opensource.wolfsonmicro.com>

Description:

		Some regulator directories will contain a field called

		bypass.  This indicates if the device is in bypass mode.



		This will be one of the following strings:



		'enabled'

		'disabled'

		'unknown'



		'enabled' means the regulator is in bypass mode.



		'disabled' means that the regulator is regulating.



		'unknown' means software cannot determine the state, or

		the reported state is invalid.

Documentation/ABI/testing/sysfs-driver-wacom

+13 −0
Original line number Diff line number Diff line 
WWhat:		/sys/class/hidraw/hidraw*/device/oled*_img

Date:		June 2012

Contact:	linux-bluetooth@vger.kernel.org

Description:

		The /sys/class/hidraw/hidraw*/device/oled*_img files control

		OLED mocro displays on Intuos4 Wireless tablet. Accepted image

		has to contain 256 bytes (64x32 px 1 bit colour). The format

		is the same as PBM image 62x32px without header (64 bits per

		horizontal line, 32 lines). An example of setting OLED No. 0:

		dd bs=256 count=1 if=img_file of=[path to oled0_img]/oled0_img

		The attribute is read only and no local copy of the image is

		stored.



What:		/sys/class/hidraw/hidraw*/device/speed

Date:		April 2010

Kernel Version:	2.6.35

Documentation/ABI/testing/sysfs-ptp

+5 −1
Original line number Diff line number Diff line
@@ -19,7 +19,11 @@ Date: September 2010 
Contact:	Richard Cochran <richardcochran@gmail.com>

Description:

		This file contains the name of the PTP hardware clock

		as a human readable string.

		as a human readable string. The purpose of this

		attribute is to provide the user with a "friendly

		name" and to help distinguish PHY based devices from

		MAC based ones. The string does not necessarily have

		to be any kind of unique id.



What:		/sys/class/ptp/ptpN/max_adjustment

Date:		September 2010