Auto-update from upstream

author Len Brown <len.brown@intel.com>

Fri, 6 Jan 2006 21:34:21 +0000 (16:34 -0500)

committer Len Brown <len.brown@intel.com>

Fri, 6 Jan 2006 21:34:21 +0000 (16:34 -0500)
author Len Brown <len.brown@intel.com>
Fri, 6 Jan 2006 21:34:21 +0000 (16:34 -0500)
committer Len Brown <len.brown@intel.com>
Fri, 6 Jan 2006 21:34:21 +0000 (16:34 -0500)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc MAINTAINERS
Simple merge
author	Len Brown <len.brown@intel.com>
	Fri, 6 Jan 2006 21:34:21 +0000 (16:34 -0500)
committer	Len Brown <len.brown@intel.com>
	Fri, 6 Jan 2006 21:34:21 +0000 (16:34 -0500)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history