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

Commit 907bc6c7 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.32' into for-2.6.33

parents d2b247a8 2a0f5cb3
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@
*.gz
*.gz
*.lzma
*.lzma
*.patch
*.patch
*.gcno


#
#
# Top-level generic files
# Top-level generic files
+8 −2
Original line number Original line Diff line number Diff line
@@ -1856,7 +1856,7 @@ E: rfkoenig@immd4.informatik.uni-erlangen.de
D: The Linux Support Team Erlangen
D: The Linux Support Team Erlangen


N: Andreas Koensgen
N: Andreas Koensgen
E: ajk@iehk.rwth-aachen.de
E: ajk@comnets.uni-bremen.de
D: 6pack driver for AX.25
D: 6pack driver for AX.25


N: Harald Koerfgen
N: Harald Koerfgen
@@ -2006,6 +2006,9 @@ E: paul@laufernet.com
D: Soundblaster driver fixes, ISAPnP quirk
D: Soundblaster driver fixes, ISAPnP quirk
S: California, USA
S: California, USA


N: Jonathan Layes
D: ARPD support

N: Tom Lees
N: Tom Lees
E: tom@lpsg.demon.co.uk
E: tom@lpsg.demon.co.uk
W: http://www.lpsg.demon.co.uk/
W: http://www.lpsg.demon.co.uk/
@@ -2797,7 +2800,7 @@ D: Starter of Linux1394 effort
S: ask per mail for current address
S: ask per mail for current address


N: Nicolas Pitre
N: Nicolas Pitre
E: nico@cam.org
E: nico@fluxnic.net
D: StrongARM SA1100 support integrator & hacker
D: StrongARM SA1100 support integrator & hacker
D: Xscale PXA architecture
D: Xscale PXA architecture
D: unified SMC 91C9x/91C11x ethernet driver (smc91x)
D: unified SMC 91C9x/91C11x ethernet driver (smc91x)
@@ -3802,6 +3805,9 @@ S: van Bronckhorststraat 12
S: 2612 XV Delft
S: 2612 XV Delft
S: The Netherlands
S: The Netherlands


N: Thomas Woller
D: CS461x Cirrus Logic sound driver

N: David Woodhouse
N: David Woodhouse
E: dwmw2@infradead.org
E: dwmw2@infradead.org
D: JFFS2 file system, Memory Technology Device subsystem,
D: JFFS2 file system, Memory Technology Device subsystem,
+2 −0
Original line number Original line Diff line number Diff line
@@ -82,6 +82,8 @@ block/
	- info on the Block I/O (BIO) layer.
	- info on the Block I/O (BIO) layer.
blockdev/
blockdev/
	- info on block devices & drivers
	- info on block devices & drivers
btmrvl.txt
	- info on Marvell Bluetooth driver usage.
cachetlb.txt
cachetlb.txt
	- describes the cache/TLB flushing interfaces Linux uses.
	- describes the cache/TLB flushing interfaces Linux uses.
cdrom/
cdrom/
+36 −0
Original line number Original line 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
+23 −14
Original line number Original line Diff line number Diff line
@@ -94,28 +94,37 @@ What: /sys/block/<disk>/queue/physical_block_size
Date:		May 2009
Date:		May 2009
Contact:	Martin K. Petersen <martin.petersen@oracle.com>
Contact:	Martin K. Petersen <martin.petersen@oracle.com>
Description:
Description:
		This is the smallest unit the storage device can write
		This is the smallest unit a physical storage device can
		without resorting to read-modify-write operation.  It is
		write atomically.  It is usually the same as the logical
		usually the same as the logical block size but may be
		block size but may be bigger.  One example is SATA
		bigger.  One example is SATA drives with 4KB sectors
		drives with 4KB sectors that expose a 512-byte logical
		that expose a 512-byte logical block size to the
		block size to the operating system.  For stacked block
		operating system.
		devices the physical_block_size variable contains the
		maximum physical_block_size of the component devices.


What:		/sys/block/<disk>/queue/minimum_io_size
What:		/sys/block/<disk>/queue/minimum_io_size
Date:		April 2009
Date:		April 2009
Contact:	Martin K. Petersen <martin.petersen@oracle.com>
Contact:	Martin K. Petersen <martin.petersen@oracle.com>
Description:
Description:
		Storage devices may report a preferred minimum I/O size,
		Storage devices may report a granularity or preferred
		which is the smallest request the device can perform
		minimum I/O size which is the smallest request the
		without incurring a read-modify-write penalty.  For disk
		device can perform without incurring a performance
		drives this is often the physical block size.  For RAID
		penalty.  For disk drives this is often the physical
		arrays it is often the stripe chunk size.
		block size.  For RAID arrays it is often the stripe
		chunk size.  A properly aligned multiple of
		minimum_io_size is the preferred request size for
		workloads where a high number of I/O operations is
		desired.


What:		/sys/block/<disk>/queue/optimal_io_size
What:		/sys/block/<disk>/queue/optimal_io_size
Date:		April 2009
Date:		April 2009
Contact:	Martin K. Petersen <martin.petersen@oracle.com>
Contact:	Martin K. Petersen <martin.petersen@oracle.com>
Description:
Description:
		Storage devices may report an optimal I/O size, which is
		Storage devices may report an optimal I/O size, which is
		the device's preferred unit of receiving I/O.  This is
		the device's preferred unit for sustained I/O.  This is
		rarely reported for disk drives.  For RAID devices it is
		rarely reported for disk drives.  For RAID arrays it is
		usually the stripe width or the internal block size.
		usually the stripe width or the internal track size.  A
		properly aligned multiple of optimal_io_size is the
		preferred request size for workloads where sustained
		throughput is desired.  If no optimal I/O size is
		reported this file contains 0.
Loading