Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git (899a1fc0) · Commits · jan.koester / Linux

CREDITS

+10 −2

Original line number	Original line	Diff line number	Diff line
	@@ -611,8 +611,7 @@ S: USA
	N: Randolph Chung		N: Randolph Chung
	E: tausq@debian.org		E: tausq@debian.org
	D: Linux/PA-RISC hacker		D: Linux/PA-RISC hacker
	S: Los Altos, CA 94022		S: Hong Kong
	S: USA

	N: Juan Jose Ciarlante		N: Juan Jose Ciarlante
	W: http://juanjox.kernelnotes.org/		W: http://juanjox.kernelnotes.org/
	@@ -3405,6 +3404,15 @@ S: Chudenicka 8
	S: 10200 Prague 10, Hostivar		S: 10200 Prague 10, Hostivar
	S: Czech Republic		S: Czech Republic

			N: Thibaut Varene
			E: T-Bone@parisc-linux.org
			W: http://www.parisc-linux.org/
			P: 1024D/B7D2F063 E67C 0D43 A75E 12A5 BB1C FA2F 1E32 C3DA B7D2 F063
			D: PA-RISC port minion, PDC and GSCPS2 drivers, debuglocks and other bits
			D: Some bits in an ARM port, S1D13XXX FB driver, random patches here and there
			D: AD1889 sound driver
			S: Paris, France

	N: Heikki Vatiainen		N: Heikki Vatiainen
	E: hessu@cs.tut.fi		E: hessu@cs.tut.fi
	D: Co-author of Multi-Protocol Over ATM (MPOA), some LANE hacks		D: Co-author of Multi-Protocol Over ATM (MPOA), some LANE hacks

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -237,8 +237,10 @@ X!Ilib/string.c
	<sect1><title>Driver Support</title>		<sect1><title>Driver Support</title>
	!Enet/core/dev.c		!Enet/core/dev.c
	!Enet/ethernet/eth.c		!Enet/ethernet/eth.c
	!Einclude/linux/etherdevice.h		!Iinclude/linux/etherdevice.h
	!Enet/core/wireless.c		<!-- FIXME: Removed for now since no structured comments in source
			X!Enet/core/wireless.c
			-->
	</sect1>		</sect1>
	<sect1><title>Synchronous PPP</title>		<sect1><title>Synchronous PPP</title>
	!Edrivers/net/wan/syncppp.c		!Edrivers/net/wan/syncppp.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	Kernel Memory Layout on ARM Linux		Kernel Memory Layout on ARM Linux

	Russell King <rmk@arm.linux.org.uk>		Russell King <rmk@arm.linux.org.uk>
	May 21, 2004 (2.6.6)		November 17, 2005 (2.6.15)

	This document describes the virtual memory layout which the Linux		This document describes the virtual memory layout which the Linux
	kernel uses for ARM processors. It indicates which regions are		kernel uses for ARM processors. It indicates which regions are
	@@ -37,6 +37,8 @@ ff000000 ffbfffff Reserved for future expansion of DMA
	mapping region.		mapping region.

	VMALLOC_END feffffff Free for platform use, recommended.		VMALLOC_END feffffff Free for platform use, recommended.
			VMALLOC_END must be aligned to a 2MB
			boundary.

	VMALLOC_START VMALLOC_END-1 vmalloc() / ioremap() space.		VMALLOC_START VMALLOC_END-1 vmalloc() / ioremap() space.
	Memory returned by vmalloc/ioremap will		Memory returned by vmalloc/ioremap will

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2907,6 +2907,11 @@ M: zaga@fly.cc.fer.hr
	L: linux-scsi@vger.kernel.org		L: linux-scsi@vger.kernel.org
	S: Maintained		S: Maintained

			WISTRON LAPTOP BUTTON DRIVER
			P: Miloslav Trmac
			M: mitr@volny.cz
			S: Maintained

	WL3501 WIRELESS PCMCIA CARD DRIVER		WL3501 WIRELESS PCMCIA CARD DRIVER
	P: Arnaldo Carvalho de Melo		P: Arnaldo Carvalho de Melo
	M: acme@conectiva.com.br		M: acme@conectiva.com.br

+1 −1