Merge branch 'video' into release
authorLen Brown <len.brown@intel.com>
Wed, 12 Nov 2008 02:15:50 +0000 (21:15 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 12 Nov 2008 02:15:50 +0000 (21:15 -0500)
commitf398778aa336a2919ee04ba45d915007230c6957
treec7244cd1d4af8d99c861b21ebcaeabf23e355b9f
parent9b5a56ddfd615a27e3a0856ceae1592a24021e42
parent2dba1b5d87e08a294da5cdfa4d32908000e9b085
Merge branch 'video' into release

Conflicts:
Documentation/kernel-parameters.txt

Signed-off-by: Len Brown <len.brown@intel.com>
Documentation/kernel-parameters.txt
drivers/acpi/Makefile
drivers/acpi/scan.c
drivers/acpi/video.c
drivers/acpi/video_detect.c
drivers/misc/fujitsu-laptop.c
include/linux/acpi.h