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

Commit 8937b734 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'for-next' of... 

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
parents 99730225 ffe7f95b

CREDITS

+1 −1
Original line number Diff line number Diff line
@@ -3738,7 +3738,7 @@ S: 93149 Nittenau 
S: Germany



N: Gertjan van Wingerde

E: gwingerde@home.nl

E: gwingerde@gmail.com

D: Ralink rt2x00 WLAN driver

D: Minix V2 file-system

D: Misc fixes

Documentation/filesystems/ext2.txt

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



Implementations for:

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

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

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

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

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

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

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

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

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 Diff line number Diff line
@@ -198,5 +198,5 @@ kernel source: <file:fs/ext3/> 
programs: 	http://e2fsprogs.sourceforge.net/

		http://ext2resize.sourceforge.net



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

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

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

Documentation/filesystems/proc.txt

+7 −0
Original line number Diff line number Diff line
@@ -1478,6 +1478,13 @@ of problems on the network like duplicate address or bad checksums. Normally, 
this should be enabled, but if the problem persists the messages can be

disabled.



netdev_budget

-------------



Maximum number of packets taken from all interfaces in one polling cycle (NAPI

poll). In one polling cycle interfaces which are registered to polling are

probed in a round-robin manner. The limit of packets in one such probe can be

set per-device via sysfs class/net/<device>/weight .



netdev_max_backlog

------------------

Documentation/hwmon/lm90

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

    Datasheet: Publicly available at the Maxim website

               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

    Prefix: 'max6646'

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

    Datasheet: Publicly available at the Maxim website

               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>