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

Commit 2d610b80 authored Aug 10, 2005 by Dave Kleikamp

Merge with /home/shaggy/git/linus-clean/



Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>

parents 8a9cd6d6 86b37860

CREDITS

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2380,8 +2380,8 @@ E: tmolina@cablespeed.com
	D: bug fixes, documentation, minor hackery		D: bug fixes, documentation, minor hackery

	N: James Morris		N: James Morris
	E: jmorris@redhat.com		E: jmorris@namei.org
	W: http://www.intercode.com.au/jmorris/		W: http://namei.org/
	D: Netfilter, Linux Security Modules (LSM), SELinux, IPSec,		D: Netfilter, Linux Security Modules (LSM), SELinux, IPSec,
	D: Crypto API, general networking, miscellaneous.		D: Crypto API, general networking, miscellaneous.
	S: PO Box 707		S: PO Box 707

Documentation/usb/usbmon.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -102,7 +102,7 @@ Here is the list of words, from left to right:
	- URB Status. This field makes no sense for submissions, but is present		- URB Status. This field makes no sense for submissions, but is present
	to help scripts with parsing. In error case, it contains the error code.		to help scripts with parsing. In error case, it contains the error code.
	In case of a setup packet, it contains a Setup Tag. If scripts read a number		In case of a setup packet, it contains a Setup Tag. If scripts read a number
	in this field, the proceed to read Data Length. Otherwise, they read		in this field, they proceed to read Data Length. Otherwise, they read
	the setup packet before reading the Data Length.		the setup packet before reading the Data Length.
	- Setup packet, if present, consists of 5 words: one of each for bmRequestType,		- Setup packet, if present, consists of 5 words: one of each for bmRequestType,
	bRequest, wValue, wIndex, wLength, as specified by the USB Specification 2.0.		bRequest, wValue, wIndex, wLength, as specified by the USB Specification 2.0.

Documentation/x86_64/boot-options.txt

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6,6 +6,11 @@ only the AMD64 specific ones are listed here.
	Machine check		Machine check

	mce=off disable machine check		mce=off disable machine check
			mce=bootlog Enable logging of machine checks left over from booting.
			Disabled by default because some BIOS leave bogus ones.
			If your BIOS doesn't do that it's a good idea to enable though
			to make sure you log even machine check events that result
			in a reboot.

	nomce (for compatibility with i386): same as mce=off		nomce (for compatibility with i386): same as mce=off

MAINTAINERS

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1658,7 +1658,7 @@ M: kuznet@ms2.inr.ac.ru
	P: Pekka Savola (ipv6)		P: Pekka Savola (ipv6)
	M: pekkas@netcore.fi		M: pekkas@netcore.fi
	P: James Morris		P: James Morris
	M: jmorris@redhat.com		M: jmorris@namei.org
	P: Hideaki YOSHIFUJI		P: Hideaki YOSHIFUJI
	M: yoshfuji@linux-ipv6.org		M: yoshfuji@linux-ipv6.org
	P: Patrick McHardy		P: Patrick McHardy
	@@ -2047,7 +2047,7 @@ SELINUX SECURITY MODULE
	P: Stephen Smalley		P: Stephen Smalley
	M: sds@epoch.ncsc.mil		M: sds@epoch.ncsc.mil
	P: James Morris		P: James Morris
	M: jmorris@redhat.com		M: jmorris@namei.org
	L: linux-kernel@vger.kernel.org (kernel issues)		L: linux-kernel@vger.kernel.org (kernel issues)
	L: selinux@tycho.nsa.gov (general discussion)		L: selinux@tycho.nsa.gov (general discussion)
	W: http://www.nsa.gov/selinux		W: http://www.nsa.gov/selinux

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 2		VERSION = 2
	PATCHLEVEL = 6		PATCHLEVEL = 6
	SUBLEVEL = 13		SUBLEVEL = 13
	EXTRAVERSION =-rc5		EXTRAVERSION =-rc6
	NAME=Woozy Numbat		NAME=Woozy Numbat

	# DOCUMENTATION		# DOCUMENTATION