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

Commit 4b4f887f authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'master' into sh/hw-breakpoints

parents 6424db52 76e7461a

.gitignore

+1 −6
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
*.lst

*.symtypes

*.order

modules.builtin

*.elf

*.bin

*.gz
@@ -45,14 +46,8 @@ Module.symvers 
#

# Generated include files

#

include/asm

include/asm-*/asm-offsets.h

include/config

include/linux/autoconf.h

include/linux/compile.h

include/linux/version.h

include/linux/utsrelease.h

include/linux/bounds.h

include/generated



# stgit generated dirs

Documentation/ABI/stable/sysfs-driver-qla2xxx

0 → 100644
+8 −0
Original line number 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

Documentation/ABI/testing/procfs-diskstats

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Description: 
		 1 - major number

		 2 - minor mumber

		 3 - device name

		 4 - reads completed succesfully

		 4 - reads completed successfully

		 5 - reads merged

		 6 - sectors read

		 7 - time spent reading (ms)

Documentation/ABI/testing/sysfs-block

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Contact: Jerome Marchand <jmarchan@redhat.com> 
Description:

		The /sys/block/<disk>/stat files displays the I/O

		statistics of disk <disk>. They contain 11 fields:

		 1 - reads completed succesfully

		 1 - reads completed successfully

		 2 - reads merged

		 3 - sectors read

		 4 - time spent reading (ms)

Documentation/ABI/testing/sysfs-bus-usb

+13 −0
Original line number Diff line number Diff line
@@ -144,3 +144,16 @@ Description: 


		Write a 1 to force the device to disconnect

		(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