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

Commit 4791d63b authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
parents b3623080 322a8b03

.gitignore

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

/Module.symvers



#

# Debian directory (make deb-pkg)

#

/debian/



#

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

#

.mailmap

+1 −2
Original line number Diff line number Diff line
@@ -73,8 +73,7 @@ Linas Vepstas <linas@austin.ibm.com> 
Mark Brown <broonie@sirena.org.uk>

Matthieu CASTET <castet.matthieu@free.fr>

Mayuresh Janorkar <mayur@ti.com>

Michael Buesch <mb@bu3sch.de>

Michael Buesch <mbuesch@freenet.de>

Michael Buesch <m@bues.ch>

Michel Dänzer <michel@tungstengraphics.com>

Mitesh shah <mshah@teja.com>

Morten Welinder <terra@gnome.org>

CREDITS

+16 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ N: Dominik Brodowski 
E: linux@brodo.de

W: http://www.brodo.de/

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



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

S: USA



N: Mattia Dongili

E: malattia@gmail.com

D: cpufrequtils (precursor to cpupowerutils)



N: Ben Dooks

E: ben-linux@fluff.org

E: ben@simtec.co.uk
@@ -1883,6 +1887,11 @@ S: Kruislaan 419 
S: 1098 VA Amsterdam 

S: The Netherlands



N: Goran Koruga

E: korugag@siol.net

D: cpufrequtils (precursor to cpupowerutils)

S: Slovenia



N: Jiri Kosina

E: jikos@jikos.cz

E: jkosina@suse.cz
@@ -2916,6 +2925,12 @@ S: Schlossbergring 9 
S: 79098 Freiburg

S: Germany



N: Thomas Renninger

E: trenn@suse.de

D: cpupowerutils

S: SUSE Linux GmbH

S: Germany



N: Joerg Reuter

E: jreuter@yaina.de

W: http://yaina.de/jreuter/

Documentation/ABI/obsolete/proc-pid-oom_adj

+1 −1
Original line number 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

	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.



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

Documentation/ABI/testing/pstore

+6 −0
Original line number Diff line number Diff line
@@ -39,3 +39,9 @@ Description: Generic interface to platform dependent persistent storage. 
		multiple) files based on the record size of the underlying

		persistent storage until at least this amount is reached.

		Default is 10 Kbytes.



		Pstore only supports one backend at a time. If multiple

		backends are available, the preferred backend may be

		set by passing the pstore.backend= argument to the kernel at

		boot time.