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

Commit 0b9e31e9 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into sched/core 



Conflicts:
	fs/proc/array.c

Merge reason: resolve conflict and queue up dependent patch.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents cf82ff7e 964fe080

Documentation/ABI/stable/sysfs-class-backlight

0 → 100644
+36 −0
Original line number Diff line number Diff line 
What:		/sys/class/backlight/<backlight>/bl_power

Date:		April 2005

KernelVersion:	2.6.12

Contact:	Richard Purdie <rpurdie@rpsys.net>

Description:

		Control BACKLIGHT power, values are FB_BLANK_* from fb.h

		 - FB_BLANK_UNBLANK (0)   : power on.

		 - FB_BLANK_POWERDOWN (4) : power off

Users:		HAL



What:		/sys/class/backlight/<backlight>/brightness

Date:		April 2005

KernelVersion:	2.6.12

Contact:	Richard Purdie <rpurdie@rpsys.net>

Description:

		Control the brightness for this <backlight>. Values

		are between 0 and max_brightness. This file will also

		show the brightness level stored in the driver, which

		may not be the actual brightness (see actual_brightness).

Users:		HAL



What:		/sys/class/backlight/<backlight>/actual_brightness

Date:		March 2006

KernelVersion:	2.6.17

Contact:	Richard Purdie <rpurdie@rpsys.net>

Description:

		Show the actual brightness by querying the hardware.

Users:		HAL



What:		/sys/class/backlight/<backlight>/max_brightness

Date:		April 2005

KernelVersion:	2.6.12

Contact:	Richard Purdie <rpurdie@rpsys.net>

Description:

		Maximum brightness for <backlight>.

Users:		HAL

Documentation/ABI/testing/sysfs-bus-pci-devices-cciss

+28 −0
Original line number Diff line number Diff line
@@ -31,3 +31,31 @@ Date: March 2009 
Kernel Version: 2.6.30

Contact:	iss_storagedev@hp.com

Description:	A symbolic link to /sys/block/cciss!cXdY



Where:		/sys/bus/pci/devices/<dev>/ccissX/rescan

Date:		August 2009

Kernel Version:	2.6.31

Contact:	iss_storagedev@hp.com

Description:	Kicks of a rescan of the controller to discover logical

		drive topology changes.



Where:		/sys/bus/pci/devices/<dev>/ccissX/cXdY/lunid

Date:		August 2009

Kernel Version: 2.6.31

Contact:	iss_storagedev@hp.com

Description:	Displays the 8-byte LUN ID used to address logical

		drive Y of controller X.



Where:		/sys/bus/pci/devices/<dev>/ccissX/cXdY/raid_level

Date:		August 2009

Kernel Version: 2.6.31

Contact:	iss_storagedev@hp.com

Description:	Displays the RAID level of logical drive Y of

		controller X.



Where:		/sys/bus/pci/devices/<dev>/ccissX/cXdY/usage_count

Date:		August 2009

Kernel Version: 2.6.31

Contact:	iss_storagedev@hp.com

Description:	Displays the usage count (number of opens) of logical drive Y

		of controller X.

Documentation/ABI/testing/sysfs-class-lcd

0 → 100644
+23 −0
Original line number Diff line number Diff line 
What:		/sys/class/lcd/<lcd>/lcd_power

Date:		April 2005

KernelVersion:	2.6.12

Contact:	Richard Purdie <rpurdie@rpsys.net>

Description:

		Control LCD power, values are FB_BLANK_* from fb.h

		 - FB_BLANK_UNBLANK (0)   : power on.

		 - FB_BLANK_POWERDOWN (4) : power off



What:		/sys/class/lcd/<lcd>/contrast

Date:		April 2005

KernelVersion:	2.6.12

Contact:	Richard Purdie <rpurdie@rpsys.net>

Description:

		Current contrast of this LCD device. Value is between 0 and

		/sys/class/lcd/<lcd>/max_contrast.



What:		/sys/class/lcd/<lcd>/max_contrast

Date:		April 2005

KernelVersion:	2.6.12

Contact:	Richard Purdie <rpurdie@rpsys.net>

Description:

		Maximum contrast for this LCD device.

Documentation/ABI/testing/sysfs-class-led

0 → 100644
+28 −0
Original line number Diff line number Diff line 
What:		/sys/class/leds/<led>/brightness

Date:		March 2006

KernelVersion:	2.6.17

Contact:	Richard Purdie <rpurdie@rpsys.net>

Description:

		Set the brightness of the LED. Most LEDs don't

		have hardware brightness support so will just be turned on for

		non-zero brightness settings. The value is between 0 and

		/sys/class/leds/<led>/max_brightness.



What:		/sys/class/leds/<led>/max_brightness

Date:		March 2006

KernelVersion:	2.6.17

Contact:	Richard Purdie <rpurdie@rpsys.net>

Description:

		Maximum brightness level for this led, default is 255 (LED_FULL).



What:		/sys/class/leds/<led>/trigger

Date:		March 2006

KernelVersion:	2.6.17

Contact:	Richard Purdie <rpurdie@rpsys.net>

Description:

		Set the trigger for this LED. A trigger is a kernel based source

		of led events.

		You can change triggers in a similar manner to the way an IO

		scheduler is chosen. Trigger specific parameters can appear in

		/sys/class/leds/<led> once a given trigger is selected.

Documentation/ABI/testing/sysfs-class-usb_host→Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc

+2 −2
Original line number Diff line number Diff line 
What:           /sys/class/usb_host/usb_hostN/wusb_chid

What:           /sys/class/uwb_rc/uwbN/wusbhc/wusb_chid

Date:           July 2008

KernelVersion:  2.6.27

Contact:        David Vrabel <david.vrabel@csr.com>
@@ -9,7 +9,7 @@ Description: 


                Set an all zero CHID to stop the host controller.



What:           /sys/class/usb_host/usb_hostN/wusb_trust_timeout

What:           /sys/class/uwb_rc/uwbN/wusbhc/wusb_trust_timeout

Date:           July 2008

KernelVersion:  2.6.27

Contact:        David Vrabel <david.vrabel@csr.com>