]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitfea42d2798e4476f2b02a74d0de6b33a59878092
treec7244cd1d4af8d99c861b21ebcaeabf23e355b9f
parentd812bf8f125fcc3e5b1f3ec5157ad68fc30056d4
parent0768268e9048841e539a993e3a434eb46a08cab8
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