Pull trivial into release branch

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

Thu, 15 Jun 2006 19:40:39 +0000 (15:40 -0400)

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

Thu, 15 Jun 2006 19:40:39 +0000 (15:40 -0400)
author Len Brown <len.brown@intel.com>
Thu, 15 Jun 2006 19:40:39 +0000 (15:40 -0400)
committer Len Brown <len.brown@intel.com>
Thu, 15 Jun 2006 19:40:39 +0000 (15:40 -0400)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc drivers/acpi/thermal.c
Simple merge
author	Len Brown <len.brown@intel.com>
	Thu, 15 Jun 2006 19:40:39 +0000 (15:40 -0400)
committer	Len Brown <len.brown@intel.com>
	Thu, 15 Jun 2006 19:40:39 +0000 (15:40 -0400)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/thermal.c	patch \|	diff1 \|	diff2 \|	blob \| history