Pull bugzilla-292300 into release branch

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

Wed, 10 Oct 2007 04:30:40 +0000 (00:30 -0400)

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

Wed, 10 Oct 2007 04:30:40 +0000 (00:30 -0400)
author Len Brown <len.brown@intel.com>
Wed, 10 Oct 2007 04:30:40 +0000 (00:30 -0400)
committer Len Brown <len.brown@intel.com>
Wed, 10 Oct 2007 04:30:40 +0000 (00:30 -0400)
diff --cc drivers/acpi/sleep/main.c
Simple merge
diff --cc include/acpi/acpi_bus.h
Simple merge
author	Len Brown <len.brown@intel.com>
	Wed, 10 Oct 2007 04:30:40 +0000 (00:30 -0400)
committer	Len Brown <len.brown@intel.com>
	Wed, 10 Oct 2007 04:30:40 +0000 (00:30 -0400)
		1	2
drivers/acpi/sleep/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/acpi/acpi_bus.h	patch \|	diff1 \|	diff2 \|	blob \| history