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

Commit bf5f4833 authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge remote-tracking branch 'wireless-next/master' into mac80211-next

parents d85dad75 35582ad9

CREDITS

+2 −2
Original line number Diff line number Diff line
@@ -823,8 +823,8 @@ S: D-69231 Rauenberg 
S: Germany



N: Jean Delvare

E: khali@linux-fr.org

W: http://khali.linux-fr.org/

E: jdelvare@suse.de

W: http://jdelvare.nerim.net/

D: Several hardware monitoring drivers

S: France

Documentation/ABI/testing/configfs-usb-gadget

+6 −6
Original line number Diff line number Diff line 
What:		/config/usb-gadget

Date:		Jun 2013

KenelVersion:	3.11

KernelVersion:	3.11

Description:

		This group contains sub-groups corresponding to created

		USB gadgets.



What:		/config/usb-gadget/gadget

Date:		Jun 2013

KenelVersion:	3.11

KernelVersion:	3.11

Description:



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


What:		/config/usb-gadget/gadget/configs

Date:		Jun 2013

KenelVersion:	3.11

KernelVersion:	3.11

Description:

		This group contains a USB gadget's configurations
@@ -58,20 +58,20 @@ Description: 


What:		/config/usb-gadget/gadget/functions

Date:		Jun 2013

KenelVersion:	3.11

KernelVersion:	3.11

Description:

		This group contains functions available to this USB gadget.



What:		/config/usb-gadget/gadget/strings

Date:		Jun 2013

KenelVersion:	3.11

KernelVersion:	3.11

Description:

		This group contains subdirectories for language-specific

		strings for this gadget.



What:		/config/usb-gadget/gadget/strings/language

Date:		Jun 2013

KenelVersion:	3.11

KernelVersion:	3.11

Description:

		The attributes:

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

+1 −1
Original line number Diff line number Diff line 
What:		/config/usb-gadget/gadget/functions/acm.name

Date:		Jun 2013

KenelVersion:	3.11

KernelVersion:	3.11

Description:



		This item contains just one readonly attribute: port_num.

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

+1 −1
Original line number Diff line number Diff line 
What:		/config/usb-gadget/gadget/functions/ecm.name

Date:		Jun 2013

KenelVersion:	3.11

KernelVersion:	3.11

Description:

		The attributes:

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

+1 −1
Original line number Diff line number Diff line 
What:		/config/usb-gadget/gadget/functions/eem.name

Date:		Jun 2013

KenelVersion:	3.11

KernelVersion:	3.11

Description:

		The attributes: