Pull osi-now into release branch

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

Sat, 2 Jun 2007 05:02:09 +0000 (01:02 -0400)

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

Sat, 2 Jun 2007 05:02:09 +0000 (01:02 -0400)
author Len Brown <len.brown@intel.com>
Sat, 2 Jun 2007 05:02:09 +0000 (01:02 -0400)
committer Len Brown <len.brown@intel.com>
Sat, 2 Jun 2007 05:02:09 +0000 (01:02 -0400)
diff --cc Documentation/kernel-parameters.txt
Simple merge
author	Len Brown <len.brown@intel.com>
	Sat, 2 Jun 2007 05:02:09 +0000 (01:02 -0400)
committer	Len Brown <len.brown@intel.com>
	Sat, 2 Jun 2007 05:02:09 +0000 (01:02 -0400)