Merge ../to-linus-stable/

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

Mon, 15 Aug 2005 19:49:00 +0000 (15:49 -0400)

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

Mon, 15 Aug 2005 19:49:00 +0000 (15:49 -0400)
author Len Brown <len.brown@intel.com>
Mon, 15 Aug 2005 19:49:00 +0000 (15:49 -0400)
committer Len Brown <len.brown@intel.com>
Mon, 15 Aug 2005 19:49:00 +0000 (15:49 -0400)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc drivers/acpi/osl.c
Simple merge
author	Len Brown <len.brown@intel.com>
	Mon, 15 Aug 2005 19:49:00 +0000 (15:49 -0400)
committer	Len Brown <len.brown@intel.com>
	Mon, 15 Aug 2005 19:49:00 +0000 (15:49 -0400)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/osl.c	patch \|	diff1 \|	diff2 \|	blob \| history