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

Commit c547fc28 authored Sep 14, 2006 by Paul Mackerras

Merge branch 'linux-2.6'

parents 3dd836a5 63b98080

Documentation/SubmittingPatches

+2 −0

Original line number	Diff line number	Diff line
		@@ -308,6 +308,8 @@ then you just add a line saying

		Signed-off-by: Random J Developer <random@developer.example.org>

		using your real name (sorry, no pseudonyms or anonymous contributions.)

		Some people also put extra tags at the end. They'll just be ignored for
		now, but you can do this to mark internal company procedures or just
		point out some special detail about the sign-off.

Documentation/cciss.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ This driver is known to work with the following cards:
		* SA P400i
		* SA E200
		* SA E200i
		* SA E500

		If nodes are not already created in the /dev/cciss directory, run as root:

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/i386/boot.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -181,6 +181,7 @@ filled out, however:
		5 ELILO
		7 GRuB
		8 U-BOOT
		9 Xen

		Please contact <hpa@zytor.com> if you need a bootloader ID
		value assigned.

Documentation/i386/zero-page.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,10 @@ Offset Type Description
		2 for bootsect-loader
		3 for SYSLINUX
		4 for ETHERBOOT
		5 for ELILO
		7 for GRuB
		8 for U-BOOT
		9 for Xen
		V = version
		0x211 char loadflags:
		bit0 = 1: kernel is loaded high (bzImage)