/home/lenb/src/to-linus branch 'acpi-2.6.12'

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

Wed, 3 Aug 2005 22:15:15 +0000 (18:15 -0400)

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

Wed, 3 Aug 2005 22:15:15 +0000 (18:15 -0400)
author Len Brown <len.brown@intel.com>
Wed, 3 Aug 2005 22:15:15 +0000 (18:15 -0400)
committer Len Brown <len.brown@intel.com>
Wed, 3 Aug 2005 22:15:15 +0000 (18:15 -0400)
diff --cc drivers/acpi/Kconfig
Simple merge
diff --cc drivers/acpi/pci_link.c
Simple merge
diff --cc drivers/acpi/processor_idle.c
Simple merge
author	Len Brown <len.brown@intel.com>
	Wed, 3 Aug 2005 22:15:15 +0000 (18:15 -0400)
committer	Len Brown <len.brown@intel.com>
	Wed, 3 Aug 2005 22:15:15 +0000 (18:15 -0400)
		1	2
drivers/acpi/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/pci_link.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/processor_idle.c	patch \|	diff1 \|	diff2 \|	blob \| history