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

Commit a3ea8e8f authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into topic/hda

parents c2de187e ebb47241

CREDITS

+3 −3
Original line number Diff line number Diff line
@@ -1677,7 +1677,7 @@ W: http://www.codemonkey.org.uk 
D: Assorted VIA x86 support.

D: 2.5 AGPGART overhaul.

D: CPUFREQ maintenance.

D: Fedora kernel maintainence.

D: Fedora kernel maintenance.

D: Misc/Other.

S: 314 Littleton Rd, Westford, MA 01886, USA
@@ -3211,7 +3211,7 @@ N: James Simmons 
E: jsimmons@infradead.org

E: jsimmons@users.sf.net 

D: Frame buffer device maintainer

D: input layer developement 

D: input layer development

D: tty/console layer

D: various mipsel devices 

S: 115 Carmel Avenue
@@ -3290,7 +3290,7 @@ S: USA 
N: Manfred Spraul

E: manfred@colorfullife.com

W: http://www.colorfullife.com/~manfred

D: Lots of tiny hacks. Larger improvments to SysV IPC msg,

D: Lots of tiny hacks. Larger improvements to SysV IPC msg,

D: slab, pipe, select.

S: 71701 Schwieberdingen

S: Germany

Documentation/00-INDEX

+2 −2
Original line number Diff line number Diff line
@@ -206,8 +206,8 @@ laptops/ 
	- directory with laptop related info and laptop driver documentation.

ldm.txt

	- a brief description of LDM (Windows Dynamic Disks).

leds-class.txt

	- documents LED handling under Linux.

leds/

	- directory with info about LED handling under Linux.

local_ops.txt

	- semantics and behavior of local atomic operations.

lockdep-design.txt

Documentation/ABI/testing/sysfs-bus-css

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ Contact: Cornelia Huck <cornelia.huck@de.ibm.com> 
		linux-s390@vger.kernel.org

Description:	Contains the PIM/PAM/POM values, as reported by the

		channel subsystem when last queried by the common I/O

		layer (this implies that this attribute is not neccessarily

		layer (this implies that this attribute is not necessarily

		in sync with the values current in the channel subsystem).

		Note: This is an I/O-subchannel specific attribute.

Users:		s390-tools, HAL

Documentation/ABI/testing/sysfs-class-led

+1 −1
Original line number Diff line number Diff line
@@ -33,5 +33,5 @@ Contact: Richard Purdie <rpurdie@rpsys.net> 
Description:

		Invert the LED on/off state. This parameter is specific to

		gpio and backlight triggers. In case of the backlight trigger,

		it is usefull when driving a LED which is intended to indicate

		it is useful when driving a LED which is intended to indicate

		a device in a standby like state.

Documentation/ABI/testing/sysfs-driver-hid-roccat-kone

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid- 
Date:		March 2010

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	The mouse can store 5 profiles which can be switched by the

                press of a button. A profile holds informations like button

                press of a button. A profile holds information like button

                mappings, sensitivity, the colors of the 5 leds and light

                effects.

                When read, these files return the respective profile. The