Commit 4ba24fef authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'next' into for-linus 

Prepare first round of input updates for 3.20.
parents 47c1ffb2 98a4a59e

.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -96,3 +96,6 @@ x509.genkey 


# Kconfig presets

all.config



# Kdevelop4

*.kdev4

.mailmap

+4 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ Aleksey Gorelov <aleksey_gorelov@phoenix.com> 
Al Viro <viro@ftp.linux.org.uk>

Al Viro <viro@zenIV.linux.org.uk>

Andreas Herrmann <aherrman@de.ibm.com>

Andrew Morton <akpm@osdl.org>

Andrew Morton <akpm@linux-foundation.org>

Andrew Vasquez <andrew.vasquez@qlogic.com>

Andy Adamson <andros@citi.umich.edu>

Archit Taneja <archit@ti.com>
@@ -51,6 +51,7 @@ Greg Kroah-Hartman <gregkh@suse.de> 
Greg Kroah-Hartman <greg@kroah.com>

Henk Vergonet <Henk.Vergonet@gmail.com>

Henrik Kretzschmar <henne@nachtwindheim.de>

Henrik Rydberg <rydberg@bitmath.org>

Herbert Xu <herbert@gondor.apana.org.au>

Jacob Shin <Jacob.Shin@amd.com>

James Bottomley <jejb@mulgrave.(none)>
@@ -102,6 +103,8 @@ Rudolf Marek <R.Marek@sh.cvut.cz> 
Rui Saraiva <rmps@joel.ist.utl.pt>

Sachin P Sant <ssant@in.ibm.com>

Sam Ravnborg <sam@mars.ravnborg.org>

Santosh Shilimkar <ssantosh@kernel.org>

Santosh Shilimkar <santosh.shilimkar@oracle.org>

Sascha Hauer <s.hauer@pengutronix.de>

S.Çağlar Onur <caglar@pardus.org.tr>

Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>

CREDITS

+10 −3
Original line number Diff line number Diff line
@@ -1197,6 +1197,13 @@ S: R. Tocantins, 89 - Cristo Rei 
S: 80050-430 - Curitiba - Paraná

S: Brazil



N: Oded Gabbay

E: oded.gabbay@gmail.com

D: AMD KFD maintainer

S: 12 Shraga Raphaeli

S: Petah-Tikva, 4906418

S: Israel



N: Kumar Gala

E: galak@kernel.crashing.org

D: Embedded PowerPC 6xx/7xx/74xx/82xx/83xx/85xx support
@@ -1727,14 +1734,14 @@ S: Chapel Hill, North Carolina 27514-4818 
S: USA



N: Dave Jones

E: davej@redhat.com

E: davej@codemonkey.org.uk

W: http://www.codemonkey.org.uk

D: Assorted VIA x86 support.

D: 2.5 AGPGART overhaul.

D: CPUFREQ maintenance.

D: Fedora kernel maintenance.

D: Fedora kernel maintenance (2003-2014).

D: 'Trinity' and similar fuzz testing work.

D: Misc/Other.

S: 314 Littleton Rd, Westford, MA 01886, USA



N: Martin Josfsson

E: gandalf@wlug.westbo.se

Documentation/.gitignore

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
filesystems/dnotify_test

laptops/dslm

timers/hpet_example

vm/hugepage-mmap

vm/hugepage-shm

vm/map_hugetlb

Documentation/00-INDEX

+2 −0
Original line number Diff line number Diff line
@@ -287,6 +287,8 @@ local_ops.txt 
	- semantics and behavior of local atomic operations.

lockdep-design.txt

	- documentation on the runtime locking correctness validator.

locking/

	- directory with info about kernel locking primitives

lockstat.txt

	- info on collecting statistics on locks (and contention).

lockup-watchdogs.txt