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

Commit d7f6884a authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge /spare/repo/linux-2.6/

parents cd28ab6a 2f4ba45a
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@
		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

@@ -321,7 +321,7 @@ the "copyright" line and a pointer to where the full notice is found.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA


Also add information on how to contact you by electronic and paper mail.
+1 −2
Original line number Diff line number Diff line
@@ -2423,8 +2423,7 @@ S: Toronto, Ontario
S: Canada

N: Zwane Mwaikambo
E: zwane@linuxpower.ca
W: http://function.linuxpower.ca
E: zwane@arm.linux.org.uk
D: Various driver hacking
D: Lowlevel x86 kernel hacking
D: General debugging
+3 −1
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ SubmittingPatches
	- procedure to get a source patch included into the kernel tree.
VGA-softcursor.txt
	- how to change your VGA cursor from a blinking underscore.
applying-patches.txt
	- description of various trees and how to apply their patches.
arm/
	- directory with info about Linux on the ARM architecture.
basic_profiling.txt
@@ -275,7 +277,7 @@ tty.txt
unicode.txt
	- info on the Unicode character/font mapping used in Linux.
uml/
	- directory with infomation about User Mode Linux.
	- directory with information about User Mode Linux.
usb/
	- directory with info regarding the Universal Serial Bus.
video4linux/
+3 −0
Original line number Diff line number Diff line
@@ -236,6 +236,9 @@ ugly), but try to avoid excess. Instead, put the comments at the head
of the function, telling people what it does, and possibly WHY it does
it.

When commenting the kernel API functions, please use the kerneldoc format.
See the files Documentation/kernel-doc-nano-HOWTO.txt and scripts/kernel-doc
for details.

		Chapter 8: You've made a mess of it

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ pool's device.
			dma_addr_t addr);

This puts memory back into the pool.  The pool is what was passed to
the the pool allocation routine; the cpu and dma addresses are what
the pool allocation routine; the cpu and dma addresses are what
were returned when that routine allocated the memory being freed.


Loading