Merge commit 'v2.6.28-rc4' into timers/rtc (a5a64498) · Commits · jan.koester / Linux

.mailmap

+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).

+2 −2

Original line number	Diff line number	Diff line
		@@ -172,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.
		@@ -382,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.

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.

+43 −0

Original line number	Diff line number	Diff line
		@@ -101,3 +101,46 @@ Description:
		Users:
		USB PM tool
		git://git.moblin.org/users/sarah/usb-pm-tool/

		What: /sys/bus/usb/device/.../authorized
		Date: July 2008
		KernelVersion: 2.6.26
		Contact: David Vrabel <david.vrabel@csr.com>
		Description:
		Authorized devices are available for use by device
		drivers, non-authorized one are not. By default, wired
		USB devices are authorized.

		Certified Wireless USB devices are not authorized
		initially and should be (by writing 1) after the
		device has been authenticated.

		What: /sys/bus/usb/device/.../wusb_cdid
		Date: July 2008
		KernelVersion: 2.6.27
		Contact: David Vrabel <david.vrabel@csr.com>
		Description:
		For Certified Wireless USB devices only.

		A devices's CDID, as 16 space-separated hex octets.

		What: /sys/bus/usb/device/.../wusb_ck
		Date: July 2008
		KernelVersion: 2.6.27
		Contact: David Vrabel <david.vrabel@csr.com>
		Description:
		For Certified Wireless USB devices only.

		Write the device's connection key (CK) to start the
		authentication of the device. The CK is 16
		space-separated hex octets.

		What: /sys/bus/usb/device/.../wusb_disconnect
		Date: July 2008
		KernelVersion: 2.6.27
		Contact: David Vrabel <david.vrabel@csr.com>
		Description:
		For Certified Wireless USB devices only.

		Write a 1 to force the device to disconnect
		(equivalent to unplugging a wired USB device).