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)
Conflicts:

include/acpi/acpi_bus.h

Signed-off-by: Len Brown <len.brown@intel.com>

Trivial merge