Pull sbs into release branch

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

Sun, 29 Apr 2007 03:16:59 +0000 (23:16 -0400)

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

Sun, 29 Apr 2007 03:16:59 +0000 (23:16 -0400)
author Len Brown <len.brown@intel.com>
Sun, 29 Apr 2007 03:16:59 +0000 (23:16 -0400)
committer Len Brown <len.brown@intel.com>
Sun, 29 Apr 2007 03:16:59 +0000 (23:16 -0400)
diff --cc drivers/acpi/Kconfig
Simple merge
diff --cc drivers/acpi/Makefile
Simple merge
author	Len Brown <len.brown@intel.com>
	Sun, 29 Apr 2007 03:16:59 +0000 (23:16 -0400)
committer	Len Brown <len.brown@intel.com>
	Sun, 29 Apr 2007 03:16:59 +0000 (23:16 -0400)
		1	2
drivers/acpi/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history