Pull Kconfig into release branch

author Len Brown <[email protected]>

Thu, 15 Jun 2006 19:35:57 +0000 (15:35 -0400)

committer Len Brown <[email protected]>

Thu, 15 Jun 2006 19:35:57 +0000 (15:35 -0400)
author Len Brown <[email protected]>
Thu, 15 Jun 2006 19:35:57 +0000 (15:35 -0400)
committer Len Brown <[email protected]>
Thu, 15 Jun 2006 19:35:57 +0000 (15:35 -0400)
diff --cc arch/ia64/Kconfig
Simple merge
diff --cc arch/x86_64/Kconfig
Simple merge
diff --cc drivers/acpi/Kconfig
Simple merge
author	Len Brown <[email protected]>
	Thu, 15 Jun 2006 19:35:57 +0000 (15:35 -0400)
committer	Len Brown <[email protected]>
	Thu, 15 Jun 2006 19:35:57 +0000 (15:35 -0400)
		1	2
arch/ia64/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86_64/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history