Merge branch 'next' into for-linus (6ad390a2) · Commits · e / devices / android_kernel_teracube_emerald

.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

+17 −2

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
	@@ -518,7 +518,7 @@ N: Zach Brown
	E: zab@zabbo.net		E: zab@zabbo.net
	D: maestro pci sound		D: maestro pci sound

	M: David Brownell		N: David Brownell
	D: Kernel engineer, mentor, and friend. Maintained USB EHCI and		D: Kernel engineer, mentor, and friend. Maintained USB EHCI and
	D: gadget layers, SPI subsystem, GPIO subsystem, and more than a few		D: gadget layers, SPI subsystem, GPIO subsystem, and more than a few
	D: device drivers. His encouragement also helped many engineers get		D: device drivers. His encouragement also helped many engineers get
	@@ -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/00-INDEX

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -272,6 +272,8 @@ printk-formats.txt
	- how to get printk format specifiers right		- how to get printk format specifiers right
	prio_tree.txt		prio_tree.txt
	- info on radix-priority-search-tree use for indexing vmas.		- info on radix-priority-search-tree use for indexing vmas.
			ramoops.txt
			- documentation of the ramoops oops/panic logging module.
	rbtree.txt		rbtree.txt
	- info on what red-black trees are and what they are for.		- info on what red-black trees are and what they are for.
	robust-futex-ABI.txt		robust-futex-ABI.txt

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