Merge branch 'linus' into core/urgent (d7619fe3) · Commits · e / devices / android_kernel_sony_msm8994

.gitignore

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -45,6 +45,11 @@ modules.builtin
	/Module.markers		/Module.markers
	/Module.symvers		/Module.symvers

			#
			# Debian directory (make deb-pkg)
			#
			/debian/

	#		#
	# git files that we don't want to ignore even it they are dot-files		# git files that we don't want to ignore even it they are dot-files
	#		#

.mailmap

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -73,8 +73,7 @@ Linas Vepstas <linas@austin.ibm.com>
	Mark Brown <broonie@sirena.org.uk>		Mark Brown <broonie@sirena.org.uk>
	Matthieu CASTET <castet.matthieu@free.fr>		Matthieu CASTET <castet.matthieu@free.fr>
	Mayuresh Janorkar <mayur@ti.com>		Mayuresh Janorkar <mayur@ti.com>
	Michael Buesch <mb@bu3sch.de>		Michael Buesch <m@bues.ch>
	Michael Buesch <mbuesch@freenet.de>
	Michel Dänzer <michel@tungstengraphics.com>		Michel Dänzer <michel@tungstengraphics.com>
	Mitesh shah <mshah@teja.com>		Mitesh shah <mshah@teja.com>
	Morten Welinder <terra@gnome.org>		Morten Welinder <terra@gnome.org>

CREDITS

+16 −1

Original line number	Original line	Diff line number	Diff line
	@@ -504,7 +504,7 @@ N: Dominik Brodowski
	E: linux@brodo.de		E: linux@brodo.de
	W: http://www.brodo.de/		W: http://www.brodo.de/
	P: 1024D/725B37C6 190F 3E77 9C89 3B6D BECD 46EE 67C3 0308 725B 37C6		P: 1024D/725B37C6 190F 3E77 9C89 3B6D BECD 46EE 67C3 0308 725B 37C6
	D: parts of CPUFreq code, ACPI bugfixes		D: parts of CPUFreq code, ACPI bugfixes, PCMCIA rewrite, cpufrequtils
	S: Tuebingen, Germany		S: Tuebingen, Germany

	N: Andries Brouwer		N: Andries Brouwer
	@@ -857,6 +857,10 @@ S: One Dell Way
	S: Round Rock, TX 78682		S: Round Rock, TX 78682
	S: USA		S: USA

			N: Mattia Dongili
			E: malattia@gmail.com
			D: cpufrequtils (precursor to cpupowerutils)

	N: Ben Dooks		N: Ben Dooks
	E: ben-linux@fluff.org		E: ben-linux@fluff.org
	E: ben@simtec.co.uk		E: ben@simtec.co.uk
	@@ -1883,6 +1887,11 @@ S: Kruislaan 419
	S: 1098 VA Amsterdam		S: 1098 VA Amsterdam
	S: The Netherlands		S: The Netherlands

			N: Goran Koruga
			E: korugag@siol.net
			D: cpufrequtils (precursor to cpupowerutils)
			S: Slovenia

	N: Jiri Kosina		N: Jiri Kosina
	E: jikos@jikos.cz		E: jikos@jikos.cz
	E: jkosina@suse.cz		E: jkosina@suse.cz
	@@ -2916,6 +2925,12 @@ S: Schlossbergring 9
	S: 79098 Freiburg		S: 79098 Freiburg
	S: Germany		S: Germany

			N: Thomas Renninger
			E: trenn@suse.de
			D: cpupowerutils
			S: SUSE Linux GmbH
			S: Germany

	N: Joerg Reuter		N: Joerg Reuter
	E: jreuter@yaina.de		E: jreuter@yaina.de
	W: http://yaina.de/jreuter/		W: http://yaina.de/jreuter/

Documentation/ABI/obsolete/proc-pid-oom_adj

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@ Why: /proc/<pid>/oom_adj allows userspace to influence the oom killer's

	A much more powerful interface, /proc/<pid>/oom_score_adj, was		A much more powerful interface, /proc/<pid>/oom_score_adj, was
	introduced with the oom killer rewrite that allows users to increase or		introduced with the oom killer rewrite that allows users to increase or
	decrease the badness() score linearly. This interface will replace		decrease the badness score linearly. This interface will replace
	/proc/<pid>/oom_adj.		/proc/<pid>/oom_adj.

	A warning will be emitted to the kernel log if an application uses this		A warning will be emitted to the kernel log if an application uses this

Documentation/ABI/stable/firewire-cdev

0 → 100644

+103 −0

Original line number	Original line	Diff line number	Diff line
			What: /dev/fw[0-9]+
			Date: May 2007
			KernelVersion: 2.6.22
			Contact: linux1394-devel@lists.sourceforge.net
			Description:
			The character device files /dev/fw* are the interface between
			firewire-core and IEEE 1394 device drivers implemented in
			userspace. The ioctl(2)- and read(2)-based ABI is defined and
			documented in <linux/firewire-cdev.h>.

			This ABI offers most of the features which firewire-core also
			exposes to kernelspace IEEE 1394 drivers.

			Each /dev/fw* is associated with one IEEE 1394 node, which can
			be remote or local nodes. Operations on a /dev/fw* file have
			different scope:
			- The 1394 node which is associated with the file:
			- Asynchronous request transmission
			- Get the Configuration ROM
			- Query node ID
			- Query maximum speed of the path between this node
			and local node
			- The 1394 bus (i.e. "card") to which the node is attached to:
			- Isochronous stream transmission and reception
			- Asynchronous stream transmission and reception
			- Asynchronous broadcast request transmission
			- PHY packet transmission and reception
			- Allocate, reallocate, deallocate isochronous
			resources (channels, bandwidth) at the bus's IRM
			- Query node IDs of local node, root node, IRM, bus
			manager
			- Query cycle time
			- Bus reset initiation, bus reset event reception
			- All 1394 buses:
			- Allocation of IEEE 1212 address ranges on the local
			link layers, reception of inbound requests to such
			an address range, asynchronous response transmission
			to inbound requests
			- Addition of descriptors or directories to the local
			nodes' Configuration ROM

			Due to the different scope of operations and in order to let
			userland implement different access permission models, some
			operations are restricted to /dev/fw* files that are associated
			with a local node:
			- Addition of descriptors or directories to the local
			nodes' Configuration ROM
			- PHY packet transmission and reception

			A /dev/fw* file remains associated with one particular node
			during its entire life time. Bus topology changes, and hence
			node ID changes, are tracked by firewire-core. ABI users do not
			need to be aware of topology.

			The following file operations are supported:

			open(2)
			Currently the only useful flags are O_RDWR.

			ioctl(2)
			Initiate various actions. Some take immediate effect, others
			are performed asynchronously while or after the ioctl returns.
			See the inline documentation in <linux/firewire-cdev.h> for
			descriptions of all ioctls.

			poll(2), select(2), epoll_wait(2) etc.
			Watch for events to become available to be read.

			read(2)
			Receive various events. There are solicited events like
			outbound asynchronous transaction completion or isochronous
			buffer completion, and unsolicited events such as bus resets,
			request reception, or PHY packet reception. Always use a read
			buffer which is large enough to receive the largest event that
			could ever arrive. See <linux/firewire-cdev.h> for descriptions
			of all event types and for which ioctls affect reception of
			events.

			mmap(2)
			Allocate a DMA buffer for isochronous reception or transmission
			and map it into the process address space. The arguments should
			be used as follows: addr = NULL, length = the desired buffer
			size, i.e. number of packets times size of largest packet,
			prot = at least PROT_READ for reception and at least PROT_WRITE
			for transmission, flags = MAP_SHARED, fd = the handle to the
			/dev/fw*, offset = 0.

			Isochronous reception works in packet-per-buffer fashion except
			for multichannel reception which works in buffer-fill mode.

			munmap(2)
			Unmap the isochronous I/O buffer from the process address space.

			close(2)
			Besides stopping and freeing I/O contexts that were associated
			with the file descriptor, back out any changes to the local
			nodes' Configuration ROM. Deallocate isochronous channels and
			bandwidth at the IRM that were marked for kernel-assisted
			re- and deallocation.

			Users: libraw1394
			libdc1394
			tools like jujuutils, fwhack, ...