Pull video into release branch

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

Sun, 22 Jul 2007 06:28:33 +0000 (02:28 -0400)

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

Sun, 22 Jul 2007 06:28:33 +0000 (02:28 -0400)
author Len Brown <len.brown@intel.com>
Sun, 22 Jul 2007 06:28:33 +0000 (02:28 -0400)
committer Len Brown <len.brown@intel.com>
Sun, 22 Jul 2007 06:28:33 +0000 (02:28 -0400)
diff --cc drivers/acpi/Kconfig
Simple merge
diff --cc drivers/video/Kconfig
Simple merge
diff --cc drivers/video/Makefile
Simple merge
author	Len Brown <len.brown@intel.com>
	Sun, 22 Jul 2007 06:28:33 +0000 (02:28 -0400)
committer	Len Brown <len.brown@intel.com>
	Sun, 22 Jul 2007 06:28:33 +0000 (02:28 -0400)
		1	2
drivers/acpi/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/video/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/video/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history