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

Commit a02efb90 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge commit 'origin' into master 

Manual merge of:

	arch/powerpc/Kconfig
	arch/powerpc/include/asm/page.h
parents 84dfcb4b 2515ddc6

.mailmap

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

Koushik <raghavendra.koushik@neterion.com>

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

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

Linas Vepstas <linas@austin.ibm.com>

Linas Vepstas <linas@austin.ibm.com>

Mark Brown <broonie@sirena.org.uk>

Matthieu CASTET <castet.matthieu@free.fr>

Matthieu CASTET <castet.matthieu@free.fr>

Michael Buesch <mb@bu3sch.de>

Michael Buesch <mb@bu3sch.de>

Michael Buesch <mbuesch@freenet.de>

Michael Buesch <mbuesch@freenet.de>

CREDITS

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

S: USA





N: Dave Jones

N: Dave Jones

E: davej@codemonkey.org.uk

E: davej@redhat.com

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

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

D: x86 errata/setup maintenance.

D: Assorted VIA x86 support.

D: AGPGART driver.

D: 2.5 AGPGART overhaul.

D: CPUFREQ maintenance.

D: CPUFREQ maintenance.

D: Backport/Forwardport merge monkey.

D: Fedora kernel maintainence.

D: Various Janitor work.

D: Misc/Other.

S: United Kingdom

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





N: Martin Josfsson

N: Martin Josfsson

E: gandalf@wlug.westbo.se

E: gandalf@wlug.westbo.se

Documentation/00-INDEX

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

	- list of changes that break older software packages.

CodingStyle

CodingStyle

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

	- 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.txt

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

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

DMA-ISA-LPC.txt

DMA-ISA-LPC.txt

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

0 → 100644
+62 −0
Original line number Original line 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 Original line Diff line number Diff line
@@ -85,3 +85,19 @@ Description: 
Users:

Users:

		PowerTOP <power@bughost.org>

		PowerTOP <power@bughost.org>

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

		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/