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

Commit 0f8f86c7 authored by Frederic Weisbecker's avatar Frederic Weisbecker
Browse files

Merge commit 'perf/core' into perf/hw-breakpoint 

Conflicts:
	kernel/Makefile
	kernel/trace/Makefile
	kernel/trace/trace.h
	samples/Makefile

Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.
parents dca2d6ac f39cdf25

CREDITS

+1 −1
Original line number Diff line number Diff line
@@ -2800,7 +2800,7 @@ D: Starter of Linux1394 effort 
S: ask per mail for current address



N: Nicolas Pitre

E: nico@cam.org

E: nico@fluxnic.net

D: StrongARM SA1100 support integrator & hacker

D: Xscale PXA architecture

D: unified SMC 91C9x/91C11x ethernet driver (smc91x)

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

+10 −0
Original line number Diff line number Diff line
@@ -84,6 +84,16 @@ Description: 
		from this part of the device tree.

		Depends on CONFIG_HOTPLUG.



What:		/sys/bus/pci/devices/.../reset

Date:		July 2009

Contact:	Michael S. Tsirkin <mst@redhat.com>

Description:

		Some devices allow an individual function to be reset

		without affecting other functions in the same device.

		For devices that have this support, a file named reset

		will be present in sysfs.  Writing 1 to this file

		will perform reset.



What:		/sys/bus/pci/devices/.../vpd

Date:		February 2008

Contact:	Ben Hutchings <bhutchings@solarflare.com>

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.