Merge branches 'release' and 'video' into release
authorLen Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:25:48 +0000 (03:25 -0500)
committerLen Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:25:48 +0000 (03:25 -0500)
commit52b097fff89b14c0b8b7a7deef1d274889b1886d
tree21eb2e3f9835bcc9d0e418e1630321677bf0e86e
parent060195500e0347a6ba8ea89739a9898961eb6f2b
parent060195500e0347a6ba8ea89739a9898961eb6f2b
parent3fa2cdcc45a0176de15cac9dbf4ed2834ebf8932
Merge branches 'release' and 'video' into release

Conflicts:

include/acpi/acpi_bus.h

Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/video.c
include/acpi/acpi_bus.h