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

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

Fri, 8 Oct 2004 20:09:18 +0000 (16:09 -0400)

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

Fri, 8 Oct 2004 20:09:18 +0000 (16:09 -0400)
author Len Brown <len.brown@intel.com>
Fri, 8 Oct 2004 20:09:18 +0000 (16:09 -0400)
committer Len Brown <len.brown@intel.com>
Fri, 8 Oct 2004 20:09:18 +0000 (16:09 -0400)
diff --cc drivers/acpi/thermal.c
Simple merge
diff --cc init/main.c
Simple merge
author	Len Brown <len.brown@intel.com>
	Fri, 8 Oct 2004 20:09:18 +0000 (16:09 -0400)
committer	Len Brown <len.brown@intel.com>
	Fri, 8 Oct 2004 20:09:18 +0000 (16:09 -0400)
		1	2
drivers/acpi/thermal.c	patch \|	diff1 \|	diff2 \|	blob \| history
init/main.c	patch \|	diff1 \|	diff2 \|	blob \| history