Commit e7e37ee9 authored by Dave Jones's avatar Dave Jones
Browse files

Merge ../linus/

parents c243f1f1 db93a82f

CREDITS

+10 −2
Original line number Diff line number Diff line
@@ -611,8 +611,7 @@ S: USA 
N: Randolph Chung

E: tausq@debian.org

D: Linux/PA-RISC hacker

S: Los Altos, CA 94022

S: USA

S: Hong Kong



N: Juan Jose Ciarlante

W: http://juanjox.kernelnotes.org/
@@ -3405,6 +3404,15 @@ S: Chudenicka 8 
S: 10200 Prague 10, Hostivar

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

E: hessu@cs.tut.fi

D: Co-author of Multi-Protocol Over ATM (MPOA), some LANE hacks

Documentation/00-INDEX

+6 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ DMA-mapping.txt 
	- info for PCI drivers using DMA portably across all platforms.

DocBook/

	- directory with DocBook templates etc. for kernel documentation.

HOWTO

	- The process and procedures of how to do Linux kernel development.

IO-mapping.txt

	- how to access I/O mapped memory from within device drivers.

IPMI.txt
@@ -256,6 +258,10 @@ specialix.txt 
	- info on hardware/driver for specialix IO8+ multiport serial card.

spinlocks.txt

	- info on using spinlocks to provide exclusive access in kernel.

stable_api_nonsense.txt

	- info on why the kernel does not have a stable in-kernel api or abi.

stable_kernel_rules.txt

	- rules and procedures for the -stable kernel releases.

stallion.txt

	- info on using the Stallion multiport serial driver.

svga.txt

Documentation/HOWTO

0 → 100644
+618 −0

File added.

Preview size limit exceeded, changes collapsed.

Documentation/arm/memory.txt

+3 −1
Original line number Diff line number Diff line 
		Kernel Memory Layout on ARM Linux



		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

kernel uses for ARM processors.  It indicates which regions are
@@ -37,6 +37,8 @@ ff000000 ffbfffff Reserved for future expansion of DMA 
				mapping region.



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.

				Memory returned by vmalloc/ioremap will

Documentation/devices.txt

+6 −6
Original line number Diff line number Diff line
@@ -2903,14 +2903,14 @@ Your cooperation is appreciated. 
		196 = /dev/dvb/adapter3/video0    first video decoder of fourth card





216 char	USB BlueTooth devices

		  0 = /dev/ttyUB0		First USB BlueTooth device

		  1 = /dev/ttyUB1		Second USB BlueTooth device

216 char	Bluetooth RFCOMM TTY devices

		  0 = /dev/rfcomm0		First Bluetooth RFCOMM TTY device

		  1 = /dev/rfcomm1		Second Bluetooth RFCOMM TTY device

		    ...



217 char	USB BlueTooth devices (alternate devices)

		  0 = /dev/cuub0		Callout device for ttyUB0

		  1 = /dev/cuub1		Callout device for ttyUB1

217 char	Bluetooth RFCOMM TTY devices (alternate devices)

		  0 = /dev/curf0		Callout device for rfcomm0

		  1 = /dev/curf1		Callout device for rfcomm1

		    ...



218 char	The Logical Company bus Unibus/Qbus adapters