ACPI: merge andy-2.6 into lenb-2.6

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

Tue, 12 Aug 2003 08:41:46 +0000 (04:41 -0400)

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

Tue, 12 Aug 2003 08:41:46 +0000 (04:41 -0400)
author Len Brown <len.brown@intel.com>
Tue, 12 Aug 2003 08:41:46 +0000 (04:41 -0400)
committer Len Brown <len.brown@intel.com>
Tue, 12 Aug 2003 08:41:46 +0000 (04:41 -0400)
diff --cc arch/i386/Kconfig
Simple merge
diff --cc arch/i386/kernel/Makefile
Simple merge
diff --cc arch/i386/kernel/dmi_scan.c
Simple merge
diff --cc init/do_mounts.c
Simple merge
author	Len Brown <len.brown@intel.com>
	Tue, 12 Aug 2003 08:41:46 +0000 (04:41 -0400)
committer	Len Brown <len.brown@intel.com>
	Tue, 12 Aug 2003 08:41:46 +0000 (04:41 -0400)
		1	2
arch/i386/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/i386/kernel/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/i386/kernel/dmi_scan.c	patch \|	diff1 \|	diff2 \|	blob \| history
init/do_mounts.c	patch \|	diff1 \|	diff2 \|	blob \| history