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

Commit e4da3fbf authored by Luciano Coelho's avatar Luciano Coelho
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wl12xx-next
parents b6932894 ba5736a5

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ Juha Yrjola <juha.yrjola@solidboot.com> 
Kay Sievers <kay.sievers@vrfy.org>

Kenneth W Chen <kenneth.w.chen@intel.com>

Koushik <raghavendra.koushik@neterion.com>

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Leonid I Ananiev <leonid.i.ananiev@intel.com>

Linas Vepstas <linas@austin.ibm.com>

Mark Brown <broonie@sirena.org.uk>
@@ -111,3 +112,4 @@ Uwe Kleine-König <ukl@pengutronix.de> 
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Yusuke Goda <goda.yusuke@renesas.com>

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/00-INDEX

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

Documentation/ABI/removed/o2cb

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

Date:		May 2011

KernelVersion:	2.6.40

KernelVersion:	3.0

Contact:	ocfs2-devel@oss.oracle.com

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

Documentation/ABI/removed/raw1394

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ Description: 
	/dev/raw1394 was a character device file that allowed low-level

	access to FireWire buses.  Its major drawbacks were its inability

	to implement sensible device security policies, and its low level

	of abstraction that required userspace clients do duplicate much

	of abstraction that required userspace clients to duplicate much

	of the kernel's ieee1394 core functionality.

	Replaced by /dev/fw*, i.e. the <linux/firewire-cdev.h> ABI of

	firewire-core.