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

Commit 4ab43267 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master'

parents 30765528 624f54be

Documentation/DocBook/kernel-api.tmpl

+4 −2
Original line number Diff line number Diff line
@@ -237,8 +237,10 @@ X!Ilib/string.c 
     <sect1><title>Driver Support</title>

!Enet/core/dev.c

!Enet/ethernet/eth.c

!Einclude/linux/etherdevice.h

!Enet/core/wireless.c

!Iinclude/linux/etherdevice.h

<!-- FIXME: Removed for now since no structured comments in source

X!Enet/core/wireless.c

-->

     </sect1>

     <sect1><title>Synchronous PPP</title>

!Edrivers/net/wan/syncppp.c

Documentation/arm/VFP/release-notes.txt

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ This release has been validated against the SoftFloat-2b library by 
John R. Hauser using the TestFloat-2a test suite.  Details of this

library and test suite can be found at:



   http://www.cs.berkeley.edu/~jhauser/arithmetic/SoftFloat.html

   http://www.jhauser.us/arithmetic/SoftFloat.html



The operations which have been tested with this package are:

Documentation/dvb/faq.txt

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ Some very frequently asked questions about linuxtv-dvb 
		Metzler Bros. DVB development; alternate drivers and

		DVB utilities, include dvb-mpegtools and tuxzap.



	http://www.linuxstb.org/

	http://sourceforge.net/projects/dvbtools/

		Dave Chapman's dvbtools package, including

		dvbstream and dvbtune

Documentation/filesystems/affs.txt

+1 −1
Original line number Diff line number Diff line
@@ -216,4 +216,4 @@ due to an incompatibility with the Amiga floppy controller. 


If you are interested in an Amiga Emulator for Linux, look at



http://www-users.informatik.rwth-aachen.de/~crux/uae.html
 
http://www.freiburg.linux.de/~uae/

Documentation/filesystems/ext2.txt

+1 −2
Original line number Diff line number Diff line
@@ -369,9 +369,8 @@ The kernel source file:/usr/src/linux/fs/ext2/ 
e2fsprogs (e2fsck)	http://e2fsprogs.sourceforge.net/

Design & Implementation	http://e2fsprogs.sourceforge.net/ext2intro.html

Journaling (ext3)	ftp://ftp.uk.linux.org/pub/linux/sct/fs/jfs/

Hashed Directories	http://kernelnewbies.org/~phillips/htree/

Filesystem Resizing	http://ext2resize.sourceforge.net/

Compression (*)		http://www.netspace.net.au/~reiter/e2compr/

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



Implementations for:

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