Merge intel.com:/home/lenb/bk/linux-2.6.3

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

Thu, 5 Feb 2004 17:21:02 +0000 (12:21 -0500)

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

Thu, 5 Feb 2004 17:21:02 +0000 (12:21 -0500)
author Len Brown <len.brown@intel.com>
Thu, 5 Feb 2004 17:21:02 +0000 (12:21 -0500)
committer Len Brown <len.brown@intel.com>
Thu, 5 Feb 2004 17:21:02 +0000 (12:21 -0500)
diff --cc CREDITS
Simple merge
diff --cc arch/i386/kernel/acpi/boot.c
Simple merge
diff --cc arch/ia64/kernel/acpi.c
Simple merge
diff --cc drivers/acpi/processor.c
Simple merge
author	Len Brown <len.brown@intel.com>
	Thu, 5 Feb 2004 17:21:02 +0000 (12:21 -0500)
committer	Len Brown <len.brown@intel.com>
	Thu, 5 Feb 2004 17:21:02 +0000 (12:21 -0500)
		1	2
CREDITS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/i386/kernel/acpi/boot.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/ia64/kernel/acpi.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/processor.c	patch \|	diff1 \|	diff2 \|	blob \| history