Pull video into test branch

author Len Brown <[email protected]>

Sat, 3 Feb 2007 03:42:02 +0000 (22:42 -0500)

committer Len Brown <[email protected]>

Sat, 3 Feb 2007 03:42:02 +0000 (22:42 -0500)
author Len Brown <[email protected]>
Sat, 3 Feb 2007 03:42:02 +0000 (22:42 -0500)
committer Len Brown <[email protected]>
Sat, 3 Feb 2007 03:42:02 +0000 (22:42 -0500)
diff --cc drivers/acpi/Kconfig
Simple merge
diff --cc drivers/acpi/video.c
Simple merge
author	Len Brown <[email protected]>
	Sat, 3 Feb 2007 03:42:02 +0000 (22:42 -0500)
committer	Len Brown <[email protected]>
	Sat, 3 Feb 2007 03:42:02 +0000 (22:42 -0500)
		1	2
drivers/acpi/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/video.c	patch \|	diff1 \|	diff2 \|	blob \| history