Pull bugfix into test branch

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

Wed, 20 Dec 2006 07:52:50 +0000 (02:52 -0500)

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

Wed, 20 Dec 2006 07:52:50 +0000 (02:52 -0500)
author Len Brown <len.brown@intel.com>
Wed, 20 Dec 2006 07:52:50 +0000 (02:52 -0500)
committer Len Brown <len.brown@intel.com>
Wed, 20 Dec 2006 07:52:50 +0000 (02:52 -0500)
diff --cc drivers/acpi/Kconfig
Simple merge
diff --cc drivers/acpi/osl.c
Simple merge
diff --cc drivers/acpi/pci_root.c
Simple merge
diff --cc drivers/acpi/processor_core.c
Simple merge
author	Len Brown <len.brown@intel.com>
	Wed, 20 Dec 2006 07:52:50 +0000 (02:52 -0500)
committer	Len Brown <len.brown@intel.com>
	Wed, 20 Dec 2006 07:52:50 +0000 (02:52 -0500)
		1	2
drivers/acpi/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/osl.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/pci_root.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/processor_core.c	patch \|	diff1 \|	diff2 \|	blob \| history