Merge commit 'v3.1-rc2' into HEAD (94bd217e) · Commits · jan.koester / Linux-deletion_scheduled-15

.gitignore

+6 −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
		#
		@@ -57,6 +62,7 @@ modules.builtin
		include/config
		include/linux/version.h
		include/generated
		arch/*/include/generated

		# stgit generated dirs
		patches-*

.mailmap

+6 −2

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ Andreas Herrmann <aherrman@de.ibm.com>
		Andrew Morton <akpm@osdl.org>
		Andrew Vasquez <andrew.vasquez@qlogic.com>
		Andy Adamson <andros@citi.umich.edu>
		Archit Taneja <archit@ti.com>
		Arnaud Patard <arnaud.patard@rtp-net.org>
		Arnd Bergmann <arnd@arndb.de>
		Axel Dyks <xl@xlsigned.net>
		@@ -31,6 +32,7 @@ Brian Avery <b.avery@hp.com>
		Brian King <brking@us.ibm.com>
		Christoph Hellwig <hch@lst.de>
		Corey Minyard <minyard@acm.org>
		Damian Hobson-Garcia <dhobsong@igel.co.jp>
		David Brownell <david-b@pacbell.net>
		David Woodhouse <dwmw2@shinybook.infradead.org>
		Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
		@@ -70,14 +72,15 @@ 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>
		Mayuresh Janorkar <mayur@ti.com>
		Michael Buesch <m@bues.ch>
		Michel Dänzer <michel@tungstengraphics.com>
		Mitesh shah <mshah@teja.com>
		Morten Welinder <terra@gnome.org>
		Morten Welinder <welinder@anemone.rentec.com>
		Morten Welinder <welinder@darter.rentec.com>
		Morten Welinder <welinder@troll.com>
		Mythri P K <mythripk@ti.com>
		Nguyen Anh Quynh <aquynh@gmail.com>
		Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
		Patrick Mochel <mochel@digitalimplant.org>
		@@ -98,6 +101,7 @@ S.Çağlar Onur <caglar@pardus.org.tr>
		Simon Kelley <simon@thekelleys.org.uk>
		Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
		Stephen Hemminger <shemminger@osdl.org>
		Sumit Semwal <sumit.semwal@ti.com>
		Tejun Heo <htejun@gmail.com>
		Thomas Graf <tgraf@suug.ch>
		Tony Luck <tony.luck@intel.com>

CREDITS

+36 −5

Original line number	Diff line number	Diff line
		@@ -328,7 +328,7 @@ S: Haifa, Israel
		N: Johannes Berg
		E: johannes@sipsolutions.net
		W: http://johannes.sipsolutions.net/
		P: 1024D/9AB78CA5 AD02 0176 4E29 C137 1DF6 08D2 FC44 CF86 9AB7 8CA5
		P: 4096R/7BF9099A C0EB C440 F6DA 091C 884D 8532 E0F3 73F3 7BF9 099A
		D: powerpc & 802.11 hacker

		N: Stephen R. van den Berg (AKA BuGless)
		@@ -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
		@@ -518,6 +518,14 @@ N: Zach Brown
		E: zab@zabbo.net
		D: maestro pci sound

		N: David Brownell
		D: Kernel engineer, mentor, and friend. Maintained USB EHCI and
		D: gadget layers, SPI subsystem, GPIO subsystem, and more than a few
		D: device drivers. His encouragement also helped many engineers get
		D: started working on the Linux kernel. David passed away in early
		D: 2011, and will be greatly missed.
		W: https://lkml.org/lkml/2011/4/5/36

		N: Gary Brubaker
		E: xavyer@ix.netcom.com
		D: USB Serial Empeg Empeg-car Mark I/II Driver
		@@ -849,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
		@@ -1677,7 +1689,7 @@ W: http://www.codemonkey.org.uk
		D: Assorted VIA x86 support.
		D: 2.5 AGPGART overhaul.
		D: CPUFREQ maintenance.
		D: Fedora kernel maintainence.
		D: Fedora kernel maintenance.
		D: Misc/Other.
		S: 314 Littleton Rd, Westford, MA 01886, USA

		@@ -1875,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
		@@ -2908,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/
		@@ -2943,6 +2966,10 @@ S: Kasarmikatu 11 A4
		S: 70110 Kuopio
		S: Finland

		N: Tobias Ringström
		E: tori@unhappy.mine.nu
		D: Davicom DM9102(A)/DM9132/DM9801 fast ethernet driver

		N: Luca Risolia
		E: luca.risolia@studio.unibo.it
		P: 1024D/FCE635A4 88E8 F32F 7244 68BA 3958 5D40 99DA 5D2A FCE6 35A4
		@@ -3211,7 +3238,7 @@ N: James Simmons
		E: jsimmons@infradead.org
		E: jsimmons@users.sf.net
		D: Frame buffer device maintainer
		D: input layer developement
		D: input layer development
		D: tty/console layer
		D: various mipsel devices
		S: 115 Carmel Avenue
		@@ -3290,7 +3317,7 @@ S: USA
		N: Manfred Spraul
		E: manfred@colorfullife.com
		W: http://www.colorfullife.com/~manfred
		D: Lots of tiny hacks. Larger improvments to SysV IPC msg,
		D: Lots of tiny hacks. Larger improvements to SysV IPC msg,
		D: slab, pipe, select.
		S: 71701 Schwieberdingen
		S: Germany
		@@ -3913,6 +3940,10 @@ S: Flandernstrasse 101
		S: D-73732 Esslingen
		S: Germany

		N: Roman Zippel
		E: zippel@linux-m68k.org
		D: AFFS and HFS filesystems, m68k maintainer, new kernel configuration in 2.5

		N: Leonard N. Zubkoff
		W: http://www.dandelion.com/Linux/
		D: BusLogic SCSI driver

Documentation/00-INDEX

+6 −12

Original line number	Diff line number	Diff line
		@@ -192,10 +192,6 @@ kernel-docs.txt
		- listing of various WWW + books that document kernel internals.
		kernel-parameters.txt
		- summary listing of command line / boot prompt args for the kernel.
		keys-request-key.txt
		- description of the kernel key request service.
		keys.txt
		- description of the kernel key retention service.
		kobject.txt
		- info of the kobject infrastructure of the Linux kernel.
		kprobes.txt
		@@ -206,8 +202,8 @@ laptops/
		- directory with laptop related info and laptop driver documentation.
		ldm.txt
		- a brief description of LDM (Windows Dynamic Disks).
		leds-class.txt
		- documents LED handling under Linux.
		leds/
		- directory with info about LED handling under Linux.
		local_ops.txt
		- semantics and behavior of local atomic operations.
		lockdep-design.txt
		@@ -276,6 +272,8 @@ printk-formats.txt
		- how to get printk format specifiers right
		prio_tree.txt
		- info on radix-priority-search-tree use for indexing vmas.
		ramoops.txt
		- documentation of the ramoops oops/panic logging module.
		rbtree.txt
		- info on what red-black trees are and what they are for.
		robust-futex-ABI.txt
		@@ -294,6 +292,8 @@ scheduler/
		- directory with info on the scheduler.
		scsi/
		- directory with info on Linux scsi support.
		security/
		- directory that contains security-related info
		serial/
		- directory with info on the low level serial API.
		serial-console.txt
		@@ -328,10 +328,6 @@ sysrq.txt
		- info on the magic SysRq key.
		telephony/
		- directory with info on telephony (e.g. voice over IP) support.
		time_interpolators.txt
		- info on time interpolators.
		uml/
		- directory with information about User Mode Linux.
		unicode.txt
		- info on the Unicode character/font mapping used in Linux.
		unshare.txt
		@@ -346,8 +342,6 @@ vm/
		- directory with info on the Linux vm code.
		volatile-considered-harmful.txt
		- Why the "volatile" type class should not be used
		voyager.txt
		- guide to running Linux on the Voyager architecture.
		w1/
		- directory with documents regarding the 1-wire (w1) subsystem.
		watchdog/

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