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

Commit e75d6606 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'master' into for-next

Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.

Conflicts:
	drivers/net/ethernet/realtek/r8169.c
parents 61282f37 00341028
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ cpuidle/
	- info on CPU_IDLE, CPU idle state management subsystem.
cputopology.txt
	- documentation on how CPU topology info is exported via sysfs.
crc32.txt
	- brief tutorial on CRC computation
cris/
	- directory with info about Linux on CRIS architecture.
crypto/
+1 −1
Original line number Diff line number Diff line
What:		devfs
Date:		July 2005 (scheduled), finally removed in kernel v2.6.18
Contact:	Greg Kroah-Hartman <gregkh@suse.de>
Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Description:
	devfs has been unmaintained for a number of years, has unfixable
	races, contains a naming policy within the kernel that is
+6 −6
Original line number Diff line number Diff line
What:		/sys/bus/usb/drivers/usbtmc/devices/*/interface_capabilities
What:		/sys/bus/usb/drivers/usbtmc/devices/*/device_capabilities
Date:		August 2008
Contact:	Greg Kroah-Hartman <gregkh@suse.de>
Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Description:
		These files show the various USB TMC capabilities as described
		by the device itself.  The full description of the bitfields
@@ -15,7 +15,7 @@ Description:
What:		/sys/bus/usb/drivers/usbtmc/devices/*/usb488_interface_capabilities
What:		/sys/bus/usb/drivers/usbtmc/devices/*/usb488_device_capabilities
Date:		August 2008
Contact:	Greg Kroah-Hartman <gregkh@suse.de>
Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Description:
		These files show the various USB TMC capabilities as described
		by the device itself.  The full description of the bitfields
@@ -29,7 +29,7 @@ Description:

What:		/sys/bus/usb/drivers/usbtmc/devices/*/TermChar
Date:		August 2008
Contact:	Greg Kroah-Hartman <gregkh@suse.de>
Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Description:
		This file is the TermChar value to be sent to the USB TMC
		device as described by the document, "Universal Serial Bus Test
@@ -42,7 +42,7 @@ Description:

What:		/sys/bus/usb/drivers/usbtmc/devices/*/TermCharEnabled
Date:		August 2008
Contact:	Greg Kroah-Hartman <gregkh@suse.de>
Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Description:
		This file determines if the TermChar is to be sent to the
		device on every transaction or not.  For more details about
@@ -53,9 +53,9 @@ Description:

What:		/sys/bus/usb/drivers/usbtmc/devices/*/auto_abort
Date:		August 2008
Contact:	Greg Kroah-Hartman <gregkh@suse.de>
Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Description:
		This file determines if the the transaction of the USB TMC
		This file determines if the transaction of the USB TMC
		device is to be automatically aborted if there is any error.
		For more details about this, please see the document,
		"Universal Serial Bus Test and Measurement Class Specification
+16 −0
Original line number Diff line number Diff line
What:		/sys/kernel/debug/olpc-ec/cmd
Date:		Dec 2011
KernelVersion:	3.4
Contact:	devel@lists.laptop.org
Description:

A generic interface for executing OLPC Embedded Controller commands and
reading their responses.

To execute a command, write data with the format: CC:N A A A A
CC is the (hex) command, N is the count of expected reply bytes, and A A A A
are optional (hex) arguments.

To read the response (if any), read from the generic node after executing
a command. Hex reply bytes will be returned, *whether or not* they came from
the immediately previous command.
+25 −0
Original line number Diff line number Diff line
What:		/sys/block/dm-<num>/dm/name
Date:		January 2009
KernelVersion:	2.6.29
Contact:	dm-devel@redhat.com
Description:	Device-mapper device name.
		Read-only string containing mapped device name.
Users:		util-linux, device-mapper udev rules

What:		/sys/block/dm-<num>/dm/uuid
Date:		January 2009
KernelVersion:	2.6.29
Contact:	dm-devel@redhat.com
Description:	Device-mapper device UUID.
		Read-only string containing DM-UUID or empty string
		if DM-UUID is not set.
Users:		util-linux, device-mapper udev rules

What:		/sys/block/dm-<num>/dm/suspended
Date:		June 2009
KernelVersion:	2.6.31
Contact:	dm-devel@redhat.com
Description:	Device-mapper device suspend state.
		Contains the value 1 while the device is suspended.
		Otherwise it contains 0. Read-only attribute.
Users:		util-linux, device-mapper udev rules
Loading