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

Commit 9a64e8e0 authored by Sage Weil's avatar Sage Weil
Browse files

Merge tag 'v3.5-rc1' 

Linux 3.5-rc1

Conflicts:
	net/ceph/messenger.c
parents f3dea7ed f8f5701b

.mailmap

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

Gustavo Padovan <gustavo@las.ic.unicamp.br>

Gustavo Padovan <padovan@profusion.mobi>

CREDITS

+2 −2
Original line number Diff line number Diff line
@@ -3814,8 +3814,8 @@ D: INFO-SHEET, former maintainer 
D: Author of the longest-living linux bug



N: Jonathan Woithe

E: jwoithe@physics.adelaide.edu.au

W: http://www.physics.adelaide.edu.au/~jwoithe

E: jwoithe@just42.net

W: http:/www.just42.net/jwoithe

D: ALS-007 sound card extensions to Sound Blaster driver

S: 20 Jordan St

S: Valley View, SA 5093

Documentation/00-INDEX

+4 −4
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ Please try and keep the descriptions small enough to fit on one line. 


Following translations are available on the WWW:



   - Japanese, maintained by the JF Project (JF@linux.or.jp), at

     http://www.linux.or.jp/JF/

   - Japanese, maintained by the JF Project (jf@listserv.linux.or.jp), at

     http://linuxjf.sourceforge.jp/



00-INDEX

	- this file.
@@ -104,6 +104,8 @@ cpuidle/ 
	- info on CPU_IDLE, CPU idle state management subsystem.

cputopology.txt

	- documentation on how CPU topology info is exported via sysfs.

crc32.txt

	- brief tutorial on CRC computation

cris/

	- directory with info about Linux on CRIS architecture.

crypto/
@@ -216,8 +218,6 @@ m68k/ 
	- directory with info about Linux on Motorola 68k architecture.

magic-number.txt

	- list of magic numbers used to mark/protect kernel data structures.

mca.txt

	- info on supporting Micro Channel Architecture (e.g. PS/2) systems.

md.txt

	- info on boot arguments for the multiple devices driver.

memory-barriers.txt

Documentation/ABI/obsolete/sysfs-class-rfkill

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ Date: 09-Jul-2007 
KernelVersion	v2.6.22

Contact:	linux-wireless@vger.kernel.org

Description: 	Current state of the transmitter.

		This file is deprecated and sheduled to be removed in 2014,

		This file is deprecated and scheduled to be removed in 2014,

		because its not possible to express the 'soft and hard block'

		state of the rfkill driver.

Values: 	A numeric value.

Documentation/ABI/removed/devfs

+1 −1
Original line number Diff line number Diff line 
What:		devfs

Date:		July 2005 (scheduled), finally removed in kernel v2.6.18

Contact:	Greg Kroah-Hartman <gregkh@suse.de>

Contact:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Description:

	devfs has been unmaintained for a number of years, has unfixable

	races, contains a naming policy within the kernel that is