Merge remote-tracking branch 'wireless-next/master' into ath-next (6ceb3391) · Commits · e / devices / android_kernel_xiaomi_markw

CREDITS

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -655,6 +655,11 @@ S: Stanford University
	S: Stanford, California 94305		S: Stanford, California 94305
	S: USA		S: USA

			N: Carlos Chinea
			E: carlos.chinea@nokia.com
			E: cch.devel@gmail.com
			D: Author of HSI Subsystem

	N: Randolph Chung		N: Randolph Chung
	E: tausq@debian.org		E: tausq@debian.org
	D: Linux/PA-RISC hacker		D: Linux/PA-RISC hacker
	@@ -818,8 +823,8 @@ S: D-69231 Rauenberg
	S: Germany		S: Germany

	N: Jean Delvare		N: Jean Delvare
	E: khali@linux-fr.org		E: jdelvare@suse.de
	W: http://khali.linux-fr.org/		W: http://jdelvare.nerim.net/
	D: Several hardware monitoring drivers		D: Several hardware monitoring drivers
	S: France		S: France

Documentation/ABI/testing/configfs-usb-gadget

+6 −6

Original line number	Original line	Diff line number	Diff line
	What: /config/usb-gadget		What: /config/usb-gadget
	Date: Jun 2013		Date: Jun 2013
	KenelVersion: 3.11		KernelVersion: 3.11
	Description:		Description:
	This group contains sub-groups corresponding to created		This group contains sub-groups corresponding to created
	USB gadgets.		USB gadgets.

	What: /config/usb-gadget/gadget		What: /config/usb-gadget/gadget
	Date: Jun 2013		Date: Jun 2013
	KenelVersion: 3.11		KernelVersion: 3.11
	Description:		Description:

	The attributes of a gadget:		The attributes of a gadget:
	@@ -27,7 +27,7 @@ Description:

	What: /config/usb-gadget/gadget/configs		What: /config/usb-gadget/gadget/configs
	Date: Jun 2013		Date: Jun 2013
	KenelVersion: 3.11		KernelVersion: 3.11
	Description:		Description:
	This group contains a USB gadget's configurations		This group contains a USB gadget's configurations

	@@ -58,20 +58,20 @@ Description:

	What: /config/usb-gadget/gadget/functions		What: /config/usb-gadget/gadget/functions
	Date: Jun 2013		Date: Jun 2013
	KenelVersion: 3.11		KernelVersion: 3.11
	Description:		Description:
	This group contains functions available to this USB gadget.		This group contains functions available to this USB gadget.

	What: /config/usb-gadget/gadget/strings		What: /config/usb-gadget/gadget/strings
	Date: Jun 2013		Date: Jun 2013
	KenelVersion: 3.11		KernelVersion: 3.11
	Description:		Description:
	This group contains subdirectories for language-specific		This group contains subdirectories for language-specific
	strings for this gadget.		strings for this gadget.

	What: /config/usb-gadget/gadget/strings/language		What: /config/usb-gadget/gadget/strings/language
	Date: Jun 2013		Date: Jun 2013
	KenelVersion: 3.11		KernelVersion: 3.11
	Description:		Description:
	The attributes:		The attributes:

Documentation/ABI/testing/configfs-usb-gadget-acm

+1 −1

Original line number	Original line	Diff line number	Diff line
	What: /config/usb-gadget/gadget/functions/acm.name		What: /config/usb-gadget/gadget/functions/acm.name
	Date: Jun 2013		Date: Jun 2013
	KenelVersion: 3.11		KernelVersion: 3.11
	Description:		Description:

	This item contains just one readonly attribute: port_num.		This item contains just one readonly attribute: port_num.

Documentation/ABI/testing/configfs-usb-gadget-ecm

+1 −1

Original line number	Original line	Diff line number	Diff line
	What: /config/usb-gadget/gadget/functions/ecm.name		What: /config/usb-gadget/gadget/functions/ecm.name
	Date: Jun 2013		Date: Jun 2013
	KenelVersion: 3.11		KernelVersion: 3.11
	Description:		Description:
	The attributes:		The attributes:

Documentation/ABI/testing/configfs-usb-gadget-eem

+1 −1

Original line number	Original line	Diff line number	Diff line
	What: /config/usb-gadget/gadget/functions/eem.name		What: /config/usb-gadget/gadget/functions/eem.name
	Date: Jun 2013		Date: Jun 2013
	KenelVersion: 3.11		KernelVersion: 3.11
	Description:		Description:
	The attributes:		The attributes: