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

Commit f652f6c5 authored by Nicholas Bellinger's avatar Nicholas Bellinger
Browse files

Merge branch 'master' of /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 into for-linus

parents 140e3008 c66ac9db
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -105,3 +105,4 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Uwe Kleine-König <ukl@pengutronix.de>
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
+2 −4
Original line number Diff line number Diff line
@@ -2365,8 +2365,6 @@ E: acme@redhat.com
W: http://oops.ghostprotocols.net:81/blog/
P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD  841A B6AB 4681 9224 DF01
D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks
S: R. Brasílio Itiberê, 4270/1010 - Água Verde
S: 80240-060 - Curitiba - Paraná
S: Brazil

N: Karsten Merker
@@ -2813,8 +2811,8 @@ D: CDROM driver "sonycd535" (Sony CDU-535/531)
N: Stelian Pop
E: stelian@popies.net
P: 1024D/EDBB6147 7B36 0E07 04BC 11DC A7A0  D3F7 7185 9E7A EDBB 6147
D: sonypi, meye drivers, mct_u232 usb serial hacks
S: Paris, France
D: random kernel hacks
S: Paimpont, France

N: Pete Popov
E: pete_popov@yahoo.com
+4 −0
Original line number Diff line number Diff line
What:		A notification mechanism for thermal related events
Description:
	This interface enables notification for thermal related events.
	The notification is in the form of a netlink event.
+9 −0
Original line number Diff line number Diff line
@@ -26,3 +26,12 @@ Description:
		scheduler is chosen. Trigger specific parameters can appear in
		/sys/class/leds/<led> once a given trigger is selected.

What:		/sys/class/leds/<led>/inverted
Date:		January 2011
KernelVersion:	2.6.38
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
		a device in a standby like state.
Loading