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

Commit aa72f689 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.0' into for-3.1

parents e6a9be0b 05d3962c

.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

+9 −1
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)
@@ -2943,6 +2943,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 +3917,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 −6
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
@@ -328,8 +326,6 @@ sysrq.txt 
	- info on the magic SysRq key.

telephony/

	- directory with info on telephony (e.g. voice over IP) support.

uml/

	- directory with information about User Mode Linux.

unicode.txt

	- info on the Unicode character/font mapping used in Linux.

unshare.txt

Documentation/ABI/obsolete/sysfs-driver-hid-roccat-koneplus

0 → 100644
+10 −0
Original line number Diff line number Diff line 
What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/startup_profile

Date:		October 2010

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	The integer value of this attribute ranges from 0-4.

                When read, this attribute returns the number of the actual

                profile. This value is persistent, so its equivalent to the

                profile that's active when the mouse is powered on next time.

		When written, this file sets the number of the startup profile

		and the mouse activates this profile immediately.

		Please use actual_profile, it does the same thing.