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

Commit 803db244 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master' into upstream-fixes

parents 8b98a37c f04b92e9

.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ 
*.ko

*.so

*.mod.c

*.i

*.lst

*.symtypes



#

# Top-level generic files

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/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)