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

Commit fd74ea65 authored by Dan Williams's avatar Dan Williams
Browse files

Merge branch 'dmaengine' into async-tx-raid6

parents c8f517c4 8c6db1bb

Documentation/RCU/checklist.txt

+12 −0
Original line number Original line Diff line number Diff line
@@ -298,3 +298,15 @@ over a rather long period of time, but improvements are always welcome! 




	Note that, rcu_assign_pointer() and rcu_dereference() relate to

	Note that, rcu_assign_pointer() and rcu_dereference() relate to

	SRCU just as they do to other forms of RCU.

	SRCU just as they do to other forms of RCU.



15.	The whole point of call_rcu(), synchronize_rcu(), and friends

	is to wait until all pre-existing readers have finished before

	carrying out some otherwise-destructive operation.  It is

	therefore critically important to -first- remove any path

	that readers can follow that could be affected by the

	destructive operation, and -only- -then- invoke call_rcu(),

	synchronize_rcu(), or friends.



	Because these primitives only wait for pre-existing readers,

	it is the caller's responsibility to guarantee safety to

	any subsequent readers.

Documentation/filesystems/ext2.txt

+5 −5
Original line number Original line Diff line number Diff line
@@ -373,10 +373,10 @@ Filesystem Resizing http://ext2resize.sourceforge.net/ 
Compression (*)		http://e2compr.sourceforge.net/

Compression (*)		http://e2compr.sourceforge.net/





Implementations for:

Implementations for:

Windows 95/98/NT/2000	http://uranus.it.swin.edu.au/~jn/linux/Explore2fs.htm

Windows 95/98/NT/2000	http://www.chrysocome.net/explore2fs

Windows 95 (*)		http://www.yipton.demon.co.uk/content.html#FSDEXT2

Windows 95 (*)		http://www.yipton.net/content.html#FSDEXT2

DOS client (*)		ftp://metalab.unc.edu/pub/Linux/system/filesystems/ext2/

DOS client (*)		ftp://metalab.unc.edu/pub/Linux/system/filesystems/ext2/

OS/2			http://perso.wanadoo.fr/matthieu.willm/ext2-os2/

OS/2 (*)		ftp://metalab.unc.edu/pub/Linux/system/filesystems/ext2/

RISC OS client		ftp://ftp.barnet.ac.uk/pub/acorn/armlinux/iscafs/

RISC OS client		http://www.esw-heim.tu-clausthal.de/~marco/smorbrod/IscaFS/





(*) no longer actively developed/supported (as of Apr 2001)
 
(*) no longer actively developed/supported (as of Mar 2009)

Documentation/filesystems/ext3.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -198,5 +198,5 @@ kernel source: <file:fs/ext3/> 
programs: 	http://e2fsprogs.sourceforge.net/

programs: 	http://e2fsprogs.sourceforge.net/

		http://ext2resize.sourceforge.net

		http://ext2resize.sourceforge.net





useful links:	http://www-106.ibm.com/developerworks/linux/library/l-fs7/

useful links:	http://www.ibm.com/developerworks/library/l-fs7.html

		http://www-106.ibm.com/developerworks/linux/library/l-fs8/
 
		http://www.ibm.com/developerworks/library/l-fs8.html

Documentation/hwmon/lm90

+10 −0
Original line number Original line Diff line number Diff line
@@ -42,6 +42,11 @@ Supported chips: 
    Addresses scanned: I2C 0x4e

    Addresses scanned: I2C 0x4e

    Datasheet: Publicly available at the Maxim website

    Datasheet: Publicly available at the Maxim website

               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3497

               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3497

  * Maxim MAX6648

    Prefix: 'max6646'

    Addresses scanned: I2C 0x4c

    Datasheet: Publicly available at the Maxim website

               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3500

  * Maxim MAX6649

  * Maxim MAX6649

    Prefix: 'max6646'

    Prefix: 'max6646'

    Addresses scanned: I2C 0x4c

    Addresses scanned: I2C 0x4c
@@ -74,6 +79,11 @@ Supported chips: 
                           0x4c, 0x4d and 0x4e

                           0x4c, 0x4d and 0x4e

    Datasheet: Publicly available at the Maxim website

    Datasheet: Publicly available at the Maxim website

               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3370

               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3370

  * Maxim MAX6692

    Prefix: 'max6646'

    Addresses scanned: I2C 0x4c

    Datasheet: Publicly available at the Maxim website

               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3500









Author: Jean Delvare <khali@linux-fr.org>

Author: Jean Delvare <khali@linux-fr.org>

MAINTAINERS

+1 −3
Original line number Original line Diff line number Diff line
@@ -1469,8 +1469,6 @@ L: linux-acpi@vger.kernel.org 
S:	Supported

S:	Supported





DOCUMENTATION (/Documentation directory)

DOCUMENTATION (/Documentation directory)

P:	Michael Kerrisk

M:	mtk.manpages@gmail.com

P:	Randy Dunlap

P:	Randy Dunlap

M:	rdunlap@xenotime.net

M:	rdunlap@xenotime.net

L:	linux-doc@vger.kernel.org

L:	linux-doc@vger.kernel.org
@@ -2879,7 +2877,7 @@ P: Michael Kerrisk 
M:	mtk.manpages@gmail.com

M:	mtk.manpages@gmail.com

W:	http://www.kernel.org/doc/man-pages

W:	http://www.kernel.org/doc/man-pages

L:	linux-man@vger.kernel.org

L:	linux-man@vger.kernel.org

S:	Supported

S:	Maintained





MARVELL LIBERTAS WIRELESS DRIVER

MARVELL LIBERTAS WIRELESS DRIVER

P:	Dan Williams

P:	Dan Williams