Merge intel.com:/home/lenb/src/26-stable-dev

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

Wed, 1 Dec 2004 13:28:14 +0000 (08:28 -0500)

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

Wed, 1 Dec 2004 13:28:14 +0000 (08:28 -0500)
author Len Brown <len.brown@intel.com>
Wed, 1 Dec 2004 13:28:14 +0000 (08:28 -0500)
committer Len Brown <len.brown@intel.com>
Wed, 1 Dec 2004 13:28:14 +0000 (08:28 -0500)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc drivers/acpi/processor.c
Simple merge
diff --cc include/acpi/processor.h
Simple merge
author	Len Brown <len.brown@intel.com>
	Wed, 1 Dec 2004 13:28:14 +0000 (08:28 -0500)
committer	Len Brown <len.brown@intel.com>
	Wed, 1 Dec 2004 13:28:14 +0000 (08:28 -0500)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/processor.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/acpi/processor.h	patch \|	diff1 \|	diff2 \|	blob \| history