Pull misc-for-upstream into release branch

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

Sat, 10 Mar 2007 04:19:50 +0000 (23:19 -0500)

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

Sat, 10 Mar 2007 04:19:50 +0000 (23:19 -0500)
author Len Brown <len.brown@intel.com>
Sat, 10 Mar 2007 04:19:50 +0000 (23:19 -0500)
committer Len Brown <len.brown@intel.com>
Sat, 10 Mar 2007 04:19:50 +0000 (23:19 -0500)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc drivers/acpi/Kconfig
Simple merge
diff --cc drivers/acpi/power.c
Simple merge
author	Len Brown <len.brown@intel.com>
	Sat, 10 Mar 2007 04:19:50 +0000 (23:19 -0500)
committer	Len Brown <len.brown@intel.com>
	Sat, 10 Mar 2007 04:19:50 +0000 (23:19 -0500)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/power.c	patch \|	diff1 \|	diff2 \|	blob \| history