]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit377b08647f4e0d06f92cca5fd8a2d304ad2f255b
tree21eb2e3f9835bcc9d0e418e1630321677bf0e86e
parent1889c74b97893c665bfe7566848ed0f882d6ab45
parent1889c74b97893c665bfe7566848ed0f882d6ab45
parentc197cd4572feffde1215dd9c4da253974309d6fe
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