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

Commit 5be5758c authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'master' into for-next 

Sync with Linus' tree to be able to apply patches against new
code I have in queue.
parents 71f66a65 7f45e5cd

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ modules.builtin 
include/config

include/linux/version.h

include/generated

arch/*/include/generated



# stgit generated dirs

patches-*

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -32,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>

CREDITS

+16 −0
Original line number Diff line number Diff line
@@ -518,6 +518,14 @@ N: Zach Brown 
E: zab@zabbo.net

D: maestro pci sound



M: 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
@@ -2943,6 +2951,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
@@ -3913,6 +3925,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

+2 −4
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
@@ -294,6 +290,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

Documentation/ABI/obsolete/o2cb→Documentation/ABI/removed/o2cb

+4 −5
Original line number Diff line number Diff line 
What:		/sys/o2cb symlink

Date:		Dec 2005

KernelVersion:	2.6.16

Date:		May 2011

KernelVersion:	2.6.40

Contact:	ocfs2-devel@oss.oracle.com

Description:	This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink will

		be removed when new versions of ocfs2-tools which know to look

Description:	This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink is

		removed when new versions of ocfs2-tools which know to look

		in /sys/fs/o2cb are sufficiently prevalent. Don't code new

		software to look here, it should try /sys/fs/o2cb instead.

		See Documentation/ABI/stable/o2cb for more information on usage.

Users:		ocfs2-tools. It's sufficient to mail proposed changes to

		ocfs2-devel@oss.oracle.com.