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

Commit 057316cc authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'linus' into test 



Conflicts:
	MAINTAINERS
	arch/x86/kernel/acpi/boot.c
	arch/x86/kernel/acpi/sleep.c
	drivers/acpi/Kconfig
	drivers/pnp/Makefile
	drivers/pnp/quirks.c

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents 3e2dab9a 2515ddc6

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ Kenneth W Chen <kenneth.w.chen@intel.com> 
Koushik <raghavendra.koushik@neterion.com>

Leonid I Ananiev <leonid.i.ananiev@intel.com>

Linas Vepstas <linas@austin.ibm.com>

Mark Brown <broonie@sirena.org.uk>

Matthieu CASTET <castet.matthieu@free.fr>

Michael Buesch <mb@bu3sch.de>

Michael Buesch <mbuesch@freenet.de>

CREDITS

+6 −6
Original line number Diff line number Diff line
@@ -1653,14 +1653,14 @@ S: Chapel Hill, North Carolina 27514-4818 
S: USA



N: Dave Jones

E: davej@codemonkey.org.uk

E: davej@redhat.com

W: http://www.codemonkey.org.uk

D: x86 errata/setup maintenance.

D: AGPGART driver.

D: Assorted VIA x86 support.

D: 2.5 AGPGART overhaul.

D: CPUFREQ maintenance.

D: Backport/Forwardport merge monkey.

D: Various Janitor work.

S: United Kingdom

D: Fedora kernel maintainence.

D: Misc/Other.

S: 314 Littleton Rd, Westford, MA 01886, USA



N: Martin Josfsson

E: gandalf@wlug.westbo.se

Documentation/00-INDEX

+3 −4
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ Changes 
	- list of changes that break older software packages.

CodingStyle

	- how the boss likes the C code in the kernel to look.

development-process/

	- An extended tutorial on how to work with the kernel development

	  process.

DMA-API.txt

	- DMA API, pci_ API & extensions for non-consistent memory machines.

DMA-ISA-LPC.txt
@@ -159,8 +162,6 @@ hayes-esp.txt 
	- info on using the Hayes ESP serial driver.

highuid.txt

	- notes on the change from 16 bit to 32 bit user/group IDs.

hpet.txt

	- High Precision Event Timer Driver for Linux.

timers/

	- info on the timer related topics

hw_random.txt
@@ -251,8 +252,6 @@ mono.txt 
	- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.

moxa-smartio

	- file with info on installing/using Moxa multiport serial driver.

mtrr.txt

	- how to use PPro Memory Type Range Registers to increase performance.

mutex-design.txt

	- info on the generic mutex subsystem.

namespaces/

Documentation/ABI/stable/sysfs-driver-usb-usbtmc

0 → 100644
+62 −0
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>

Description:

		These files show the various USB TMC capabilities as described

		by the device itself.  The full description of the bitfields

		can be found in the USB TMC documents from the USB-IF entitled

		"Universal Serial Bus Test and Measurement Class Specification

		(USBTMC) Revision 1.0" section 4.2.1.8.



		The files are read only.





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>

Description:

		These files show the various USB TMC capabilities as described

		by the device itself.  The full description of the bitfields

		can be found in the USB TMC documents from the USB-IF entitled

		"Universal Serial Bus Test and Measurement Class, Subclass

		USB488 Specification (USBTMC-USB488) Revision 1.0" section

		4.2.2.



		The files are read only.





What:		/sys/bus/usb/drivers/usbtmc/devices/*/TermChar

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Description:

		This file is the TermChar value to be sent to the USB TMC

		device as described by the document, "Universal Serial Bus Test

		and Measurement Class Specification

		(USBTMC) Revision 1.0" as published by the USB-IF.



		Note that the TermCharEnabled file determines if this value is

		sent to the device or not.





What:		/sys/bus/usb/drivers/usbtmc/devices/*/TermCharEnabled

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Description:

		This file determines if the TermChar is to be sent to the

		device on every transaction or not.  For more details about

		this, please see the document, "Universal Serial Bus Test and

		Measurement Class Specification (USBTMC) Revision 1.0" as

		published by the USB-IF.





What:		/sys/bus/usb/drivers/usbtmc/devices/*/auto_abort

Date:		August 2008

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Description:

		This file determines if the 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

		(USBTMC) Revision 1.0" as published by the USB-IF.

Documentation/ABI/testing/sysfs-bus-usb

+16 −0
Original line number Diff line number Diff line
@@ -85,3 +85,19 @@ Description: 
Users:

		PowerTOP <power@bughost.org>

		http://www.lesswatts.org/projects/powertop/



What:		/sys/bus/usb/device/<busnum>-<devnum>...:<config num>-<interface num>/supports_autosuspend

Date:		January 2008

KernelVersion:	2.6.27

Contact:	Sarah Sharp <sarah.a.sharp@intel.com>

Description:

		When read, this file returns 1 if the interface driver

		for this interface supports autosuspend.  It also

		returns 1 if no driver has claimed this interface, as an

		unclaimed interface will not stop the device from being

		autosuspended if all other interface drivers are idle.

		The file returns 0 if autosuspend support has not been

		added to the driver.

Users:

		USB PM tool

		git://git.moblin.org/users/sarah/usb-pm-tool/