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

Commit 163849ea authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.33' into for-2.6.34

parents 2138301e 5ee518ec
Loading
Loading
Loading
Loading
+2 −6
Original line number Original line Diff line number Diff line
@@ -22,9 +22,11 @@
*.lst
*.lst
*.symtypes
*.symtypes
*.order
*.order
modules.builtin
*.elf
*.elf
*.bin
*.bin
*.gz
*.gz
*.bz2
*.lzma
*.lzma
*.patch
*.patch
*.gcno
*.gcno
@@ -44,14 +46,8 @@ Module.symvers
#
#
# Generated include files
# Generated include files
#
#
include/asm
include/asm-*/asm-offsets.h
include/config
include/config
include/linux/autoconf.h
include/linux/compile.h
include/linux/version.h
include/linux/version.h
include/linux/utsrelease.h
include/linux/bounds.h
include/generated
include/generated


# stgit generated dirs
# stgit generated dirs
+8 −0
Original line number Original line Diff line number Diff line
What:		/sys/bus/pci/drivers/qla2xxx/.../devices/*
Date:		September 2009
Contact:	QLogic Linux Driver <linux-driver@qlogic.com>
Description:	qla2xxx-udev.sh currently looks for uevent CHANGE events to
		signal a firmware-dump has been generated by the driver and is
		ready for retrieval.
Users:		qla2xxx-udev.sh.  Proposed changes should be mailed to
		linux-driver@qlogic.com
+1 −1
Original line number Original line Diff line number Diff line
@@ -8,7 +8,7 @@ Description:
		 1 - major number
		 1 - major number
		 2 - minor mumber
		 2 - minor mumber
		 3 - device name
		 3 - device name
		 4 - reads completed succesfully
		 4 - reads completed successfully
		 5 - reads merged
		 5 - reads merged
		 6 - sectors read
		 6 - sectors read
		 7 - time spent reading (ms)
		 7 - time spent reading (ms)
+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ Contact: Jerome Marchand <jmarchan@redhat.com>
Description:
Description:
		The /sys/block/<disk>/stat files displays the I/O
		The /sys/block/<disk>/stat files displays the I/O
		statistics of disk <disk>. They contain 11 fields:
		statistics of disk <disk>. They contain 11 fields:
		 1 - reads completed succesfully
		 1 - reads completed successfully
		 2 - reads merged
		 2 - reads merged
		 3 - sectors read
		 3 - sectors read
		 4 - time spent reading (ms)
		 4 - time spent reading (ms)
+23 −8
Original line number Original line Diff line number Diff line
@@ -21,25 +21,27 @@ Contact: Alan Stern <stern@rowland.harvard.edu>
Description:
Description:
		Each USB device directory will contain a file named
		Each USB device directory will contain a file named
		power/level.  This file holds a power-level setting for
		power/level.  This file holds a power-level setting for
		the device, one of "on", "auto", or "suspend".
		the device, either "on" or "auto".


		"on" means that the device is not allowed to autosuspend,
		"on" means that the device is not allowed to autosuspend,
		although normal suspends for system sleep will still
		although normal suspends for system sleep will still
		be honored.  "auto" means the device will autosuspend
		be honored.  "auto" means the device will autosuspend
		and autoresume in the usual manner, according to the
		and autoresume in the usual manner, according to the
		capabilities of its driver.  "suspend" means the device
		capabilities of its driver.
		is forced into a suspended state and it will not autoresume
		in response to I/O requests.  However remote-wakeup requests
		from the device may still be enabled (the remote-wakeup
		setting is controlled separately by the power/wakeup
		attribute).


		During normal use, devices should be left in the "auto"
		During normal use, devices should be left in the "auto"
		level.  The other levels are meant for administrative uses.
		level.  The "on" level is meant for administrative uses.
		If you want to suspend a device immediately but leave it
		If you want to suspend a device immediately but leave it
		free to wake up in response to I/O requests, you should
		free to wake up in response to I/O requests, you should
		write "0" to power/autosuspend.
		write "0" to power/autosuspend.


		Device not capable of proper suspend and resume should be
		left in the "on" level.  Although the USB spec requires
		devices to support suspend/resume, many of them do not.
		In fact so many don't that by default, the USB core
		initializes all non-hub devices in the "on" level.  Some
		drivers may change this setting when they are bound.

What:		/sys/bus/usb/devices/.../power/persist
What:		/sys/bus/usb/devices/.../power/persist
Date:		May 2007
Date:		May 2007
KernelVersion:	2.6.23
KernelVersion:	2.6.23
@@ -144,3 +146,16 @@ Description:


		Write a 1 to force the device to disconnect
		Write a 1 to force the device to disconnect
		(equivalent to unplugging a wired USB device).
		(equivalent to unplugging a wired USB device).

What:		/sys/bus/usb/drivers/.../remove_id
Date:		November 2009
Contact:	CHENG Renquan <rqcheng@smu.edu.sg>
Description:
		Writing a device ID to this file will remove an ID
		that was dynamically added via the new_id sysfs entry.
		The format for the device ID is:
		idVendor idProduct.	After successfully
		removing an ID, the driver will no longer support the
		device.  This is useful to ensure auto probing won't
		match the driver to the device.  For example:
		# echo "046d c315" > /sys/bus/usb/drivers/foo/remove_id
Loading