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

Commit d1a76187 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'v2.6.28-rc2' into core/locking 

Conflicts:
	arch/um/include/asm/system.h
parents c7e78cff 0173a326

.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

+17 −6
Original line number Diff line number Diff line
@@ -598,6 +598,11 @@ S: Tamsui town, Taipei county, 
S: Taiwan 251

S: Republic of China



N: Reinette Chatre

E: reinette.chatre@intel.com

D: WiMedia Link Protocol implementation

D: UWB stack bits and pieces



N: Michael Elizabeth Chastain

E: mec@shout.net

D: Configure, Menuconfig, xconfig
@@ -1653,14 +1658,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
@@ -2695,6 +2700,12 @@ S: Demonstratsii 8-382 
S: Tula 300000

S: Russia



N: Inaky Perez-Gonzalez

E: inaky.perez-gonzalez@intel.com

D: UWB stack, HWA-RC driver and HWA-HC drivers

D: Wireless USB additions to the USB stack

D: WiMedia Link Protocol bits and pieces



N: Gordon Peters

E: GordPeters@smarttech.com

D: Isochronous receive for IEEE 1394 driver (OHCI module).

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-umc

0 → 100644
+28 −0
Original line number Diff line number Diff line 
What:           /sys/bus/umc/

Date:           July 2008

KernelVersion:  2.6.27

Contact:        David Vrabel <david.vrabel@csr.com>

Description:

                The Wireless Host Controller Interface (WHCI)

                specification describes a PCI-based device with

                multiple capabilities; the UWB Multi-interface

                Controller (UMC).



                The umc bus presents each of the individual

                capabilties as a device.



What:           /sys/bus/umc/devices/.../capability_id

Date:           July 2008

KernelVersion:  2.6.27

Contact:        David Vrabel <david.vrabel@csr.com>

Description:

                The ID of this capability, with 0 being the radio

                controller capability.



What:           /sys/bus/umc/devices/.../version

Date:           July 2008

KernelVersion:  2.6.27

Contact:        David Vrabel <david.vrabel@csr.com>

Description:

                The specification version this capability's hardware

                interface complies with.