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

Commit e21e696e authored by James Morris's avatar James Morris
Browse files

Merge branch 'master' into next

parents 2f99db28 75fa6770
Loading
Loading
Loading
Loading
+3 −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>
@@ -79,6 +80,8 @@ Nguyen Anh Quynh <aquynh@gmail.com>
Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Patrick Mochel <mochel@digitalimplant.org>
Peter A Jonsson <pj@ludd.ltu.se>
Peter Oruba <peter@oruba.de>
Peter Oruba <peter.oruba@amd.com>
Praveen BP <praveenbp@ti.com>
Rajesh Shah <rajesh.shah@intel.com>
Ralf Baechle <ralf@linux-mips.org>
+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).
+5 −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
@@ -171,7 +172,7 @@ i2c/
	- directory with info about the I2C bus/protocol (2 wire, kHz speed).
i2o/
	- directory with info about the Linux I2O subsystem.
i386/
x86/i386/
	- directory with info about Linux on Intel 32 bit architecture.
ia64/
	- directory with info about Linux on Intel 64 bit architecture.
@@ -381,7 +382,7 @@ w1/
	- directory with documents regarding the 1-wire (w1) subsystem.
watchdog/
	- how to auto-reboot Linux if it has "fallen and can't get up". ;-)
x86_64/
x86/x86_64/
	- directory with info on Linux support for AMD x86-64 (Hammer) machines.
zorro.txt
	- info on writing drivers for Zorro bus devices found on Amigas.
+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.
+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.
Loading