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

Commit 6548698f authored by Frederic Weisbecker's avatar Frederic Weisbecker
Browse files

Merge commit 'v2.6.32' into reiserfs/kill-bkl 

Merge-reason: The tree was based 2.6.31. It's better to be up to date
with 2.6.32. Although no conflicting changes were made in between,
it gives benchmarking results closer to the lastest kernel behaviour.
parents 1d2c6cfd 22763c5c

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
*.elf

*.bin

*.gz

*.bz2

*.lzma

*.patch

*.gcno

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/00-INDEX

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ block/ 
	- info on the Block I/O (BIO) layer.

blockdev/

	- info on block devices & drivers

btmrvl.txt

	- info on Marvell Bluetooth driver usage.

cachetlb.txt

	- describes the cache/TLB flushing interfaces Linux uses.

cdrom/

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>