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

Commit f9bcda77 authored Sep 04, 2006 by Jeff Garzik

Merge branch 'master' into upstream

parents 9bec2e38 c336923b

Documentation/feature-removal-schedule.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -120,6 +120,13 @@ Who: Adrian Bunk <bunk@stusta.de>

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

		What: drivers depending on OSS_OBSOLETE_DRIVER
		When: options in 2.6.20, code in 2.6.22
		Why: OSS drivers with ALSA replacements
		Who: Adrian Bunk <bunk@stusta.de>

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

		What: pci_module_init(driver)
		When: January 2007
		Why: Is replaced by pci_register_driver(pci_driver).

Documentation/kernel-parameters.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -1183,6 +1183,8 @@ running once the system is up.
		Mechanism 2.
		nommconf [IA-32,X86_64] Disable use of MMCONFIG for PCI
		Configuration
		mmconf [IA-32,X86_64] Force MMCONFIG. This is useful
		to override the builtin blacklist.
		nomsi [MSI] If the PCI_MSI kernel config parameter is
		enabled, this kernel boot option can be used to
		disable the use of MSI interrupts system-wide.

Documentation/powerpc/booting-without-of.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -1136,10 +1136,10 @@ Sense and level information should be encoded as follows:
		Devices connected to openPIC-compatible controllers should encode
		sense and polarity as follows:

		0 = high to low edge sensitive type enabled
		0 = low to high edge sensitive type enabled
		1 = active low level sensitive type enabled
		2 = low to high edge sensitive type enabled
		3 = active high level sensitive type enabled
		2 = active high level sensitive type enabled
		3 = high to low edge sensitive type enabled

		ISA PIC interrupt controllers should adhere to the ISA PIC
		encodings listed below:

MAINTAINERS

+2 −1

Original line number	Diff line number	Diff line
		@@ -3296,10 +3296,11 @@ S: Maintained

		XFS FILESYSTEM
		P: Silicon Graphics Inc
		P: Tim Shimmin, David Chatterton
		M: xfs-masters@oss.sgi.com
		M: nathans@sgi.com
		L: xfs@oss.sgi.com
		W: http://oss.sgi.com/projects/xfs
		T: git git://oss.sgi.com:8090/xfs/xfs-2.6
		S: Supported

		X86 3-LEVEL PAGING (PAE) SUPPORT

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 2
		PATCHLEVEL = 6
		SUBLEVEL = 18
		EXTRAVERSION = -rc5
		EXTRAVERSION = -rc6
		NAME=Crazed Snow-Weasel

		# DOCUMENTATION