Pull bugzilla-8842 into release branch

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

Sun, 12 Aug 2007 04:19:23 +0000 (00:19 -0400)

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

Sun, 12 Aug 2007 04:19:23 +0000 (00:19 -0400)
author Len Brown <len.brown@intel.com>
Sun, 12 Aug 2007 04:19:23 +0000 (00:19 -0400)
committer Len Brown <len.brown@intel.com>
Sun, 12 Aug 2007 04:19:23 +0000 (00:19 -0400)
diff --cc Documentation/kernel-parameters.txt
Simple merge
author	Len Brown <len.brown@intel.com>
	Sun, 12 Aug 2007 04:19:23 +0000 (00:19 -0400)
committer	Len Brown <len.brown@intel.com>
	Sun, 12 Aug 2007 04:19:23 +0000 (00:19 -0400)