Pull bugzilla-5000 into release branch

author Len Brown <[email protected]>

Fri, 16 Jun 2006 01:36:11 +0000 (21:36 -0400)

committer Len Brown <[email protected]>

Fri, 16 Jun 2006 01:36:11 +0000 (21:36 -0400)
author Len Brown <[email protected]>
Fri, 16 Jun 2006 01:36:11 +0000 (21:36 -0400)
committer Len Brown <[email protected]>
Fri, 16 Jun 2006 01:36:11 +0000 (21:36 -0400)
diff --cc drivers/acpi/bus.c
Simple merge
diff --cc drivers/acpi/scan.c
Simple merge
diff --cc drivers/acpi/thermal.c
Simple merge
diff --cc include/acpi/acpi_bus.h
Simple merge
author	Len Brown <[email protected]>
	Fri, 16 Jun 2006 01:36:11 +0000 (21:36 -0400)
committer	Len Brown <[email protected]>
	Fri, 16 Jun 2006 01:36:11 +0000 (21:36 -0400)
		1	2
drivers/acpi/bus.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/scan.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/thermal.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/acpi/acpi_bus.h	patch \|	diff1 \|	diff2 \|	blob \| history