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

Commit 61454f33 authored by Felix Blyakher's avatar Felix Blyakher
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

parents 4740cd8b 8e0ee43b

CREDITS

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

S: Germany





N: Gertjan van Wingerde

N: Gertjan van Wingerde

E: gwingerde@home.nl

E: gwingerde@gmail.com

D: Ralink rt2x00 WLAN driver

D: Ralink rt2x00 WLAN driver

D: Minix V2 file-system

D: Minix V2 file-system

D: Misc fixes

D: Misc fixes

Documentation/filesystems/ext2.txt

+3 −2
Original line number Original line Diff line number Diff line
@@ -376,7 +376,8 @@ Implementations for: 
Windows 95/98/NT/2000	http://www.chrysocome.net/explore2fs

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

Windows 95 (*)		http://www.yipton.net/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 (*)		ftp://metalab.unc.edu/pub/Linux/system/filesystems/ext2/

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

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

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





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

(+) no longer actively developed/supported (as of Mar 2009)

Documentation/filesystems/proc.txt

+7 −0
Original line number Original line 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

this should be enabled, but if the problem persists the messages can be

disabled.

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

netdev_max_backlog

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

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

Documentation/logo.gif

deleted100644 → 0
−16 KiB
Loading image diff...

Documentation/logo.svg

0 → 100644
+2911 −0

File added.

Preview size limit exceeded, changes collapsed.