Pull trivial1 into release branch

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

Thu, 15 Jun 2006 19:37:09 +0000 (15:37 -0400)

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

Thu, 15 Jun 2006 19:37:09 +0000 (15:37 -0400)
author Len Brown <len.brown@intel.com>
Thu, 15 Jun 2006 19:37:09 +0000 (15:37 -0400)
committer Len Brown <len.brown@intel.com>
Thu, 15 Jun 2006 19:37:09 +0000 (15:37 -0400)
diff --cc drivers/acpi/asus_acpi.c
Simple merge
diff --cc drivers/acpi/scan.c
Simple merge
author	Len Brown <len.brown@intel.com>
	Thu, 15 Jun 2006 19:37:09 +0000 (15:37 -0400)
committer	Len Brown <len.brown@intel.com>
	Thu, 15 Jun 2006 19:37:09 +0000 (15:37 -0400)
		1	2
drivers/acpi/asus_acpi.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/scan.c	patch \|	diff1 \|	diff2 \|	blob \| history