Merge branch 'linus' into stackprotector (a9de18eb) · Commits · e / devices / android_kernel_fairphone_FP4

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

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

+9 −42

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
		@@ -39,14 +42,8 @@ IRQ.txt
		- description of what an IRQ is.
		ManagementStyle
		- how to (attempt to) manage kernel hackers.
		MSI-HOWTO.txt
		- the Message Signaled Interrupts (MSI) Driver Guide HOWTO and FAQ.
		RCU/
		- directory with info on RCU (read-copy update).
		README.DAC960
		- info on Mylex DAC960/DAC1100 PCI RAID Controller Driver for Linux.
		README.cycladesZ
		- info on Cyclades-Z firmware loading.
		SAK.txt
		- info on Secure Attention Keys.
		SM501.txt
		@@ -83,20 +80,16 @@ blackfin/
		- directory with documentation for the Blackfin arch.
		block/
		- info on the Block I/O (BIO) layer.
		blockdev/
		- info on block devices & drivers
		cachetlb.txt
		- describes the cache/TLB flushing interfaces Linux uses.
		cciss.txt
		- info, major/minor #'s for Compaq's SMART Array Controllers.
		cdrom/
		- directory with information on the CD-ROM drivers that Linux has.
		computone.txt
		- info on Computone Intelliport II/Plus Multiport Serial Driver.
		connector/
		- docs on the netlink based userspace<->kernel space communication mod.
		console/
		- documentation on Linux console drivers.
		cpqarray.txt
		- info on using Compaq's SMART2 Intelligent Disk Array Controllers.
		cpu-freq/
		- info on CPU frequency and voltage scaling.
		cpu-hotplug.txt
		@@ -123,8 +116,6 @@ device-mapper/
		- directory with info on Device Mapper.
		devices.txt
		- plain ASCII listing of all the nodes in /dev/ with major minor #'s.
		digiepca.txt
		- info on Digi Intl. {PC,PCI,EISA}Xx and Xem series cards.
		dontdiff
		- file containing a list of files that should never be diff'ed.
		driver-model/
		@@ -149,14 +140,10 @@ filesystems/
		- info on the vfs and the various filesystems that Linux supports.
		firmware_class/
		- request_firmware() hotplug interface info.
		floppy.txt
		- notes and driver options for the floppy disk driver.
		frv/
		- Fujitsu FR-V Linux documentation.
		gpio.txt
		- overview of GPIO (General Purpose Input/Output) access conventions.
		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.
		timers/
		@@ -169,7 +156,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.
		@@ -183,8 +170,6 @@ io_ordering.txt
		- info on ordering I/O writes to memory-mapped addresses.
		ioctl/
		- directory with documents describing various IOCTL calls.
		ioctl-number.txt
		- how to implement and register device/driver ioctl calls.
		iostats.txt
		- info on I/O statistics Linux kernel provides.
		irqflags-tracing.txt
		@@ -247,14 +232,10 @@ mips/
		- directory with info about Linux on MIPS architecture.
		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.
		mutex-design.txt
		- info on the generic mutex subsystem.
		namespaces/
		- directory with various information about namespaces
		nbd.txt
		- info on a TCP implementation of a network block device.
		netlabel/
		- directory with information on the NetLabel subsystem.
		networking/
		@@ -267,8 +248,6 @@ numastat.txt
		- info on how to read Numa policy hit/miss statistics in sysfs.
		oops-tracing.txt
		- how to decode those nasty internal kernel error dump messages.
		paride.txt
		- information about the parallel port IDE subsystem.
		parisc/
		- directory with info on using Linux on PA-RISC architecture.
		parport.txt
		@@ -287,20 +266,16 @@ powerpc/
		- directory with info on using Linux with the PowerPC.
		preempt-locking.txt
		- info on locking under a preemptive kernel.
		printk-formats.txt
		- how to get printk format specifiers right
		prio_tree.txt
		- info on radix-priority-search-tree use for indexing vmas.
		ramdisk.txt
		- short guide on how to set up and use the RAM disk.
		rbtree.txt
		- info on what red-black trees are and what they are for.
		riscom8.txt
		- notes on using the RISCom/8 multi-port serial driver.
		robust-futex-ABI.txt
		- documentation of the robust futex ABI.
		robust-futexes.txt
		- a description of what robust futexes are.
		rocket.txt
		- info on the Comtrol RocketPort multiport serial driver.
		rt-mutex-design.txt
		- description of the RealTime mutex implementation design.
		rt-mutex.txt
		@@ -329,8 +304,6 @@ sparc/
		- directory with info on using Linux on Sparc architecture.
		sparse.txt
		- info on how to obtain and use the sparse tool for typechecking.
		specialix.txt
		- info on hardware/driver for specialix IO8+ multiport serial card.
		spi/
		- overview of Linux kernel Serial Peripheral Interface (SPI) support.
		spinlocks.txt
		@@ -339,14 +312,10 @@ stable_api_nonsense.txt
		- info on why the kernel does not have a stable in-kernel api or abi.
		stable_kernel_rules.txt
		- rules and procedures for the -stable kernel releases.
		stallion.txt
		- info on using the Stallion multiport serial driver.
		svga.txt
		- short guide on selecting video modes at boot via VGA BIOS.
		sysfs-rules.txt
		- How not to use sysfs.
		sx.txt
		- info on the Specialix SX/SI multiport serial driver.
		sysctl/
		- directory with info on the /proc/sys/* files.
		sysrq.txt
		@@ -355,8 +324,6 @@ telephony/
		- directory with info on telephony (e.g. voice over IP) support.
		time_interpolators.txt
		- info on time interpolators.
		tty.txt
		- guide to the locking policies of the tty layer.
		uml/
		- directory with information about User Mode Linux.
		unicode.txt
		@@ -379,7 +346,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.

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.