Merge branch 'video-error-case' into release
commitcccc67a4cf52a952e6371ac75510994e0bddec96
authorLen Brown <len.brown@intel.com>
Wed, 30 Dec 2009 07:51:38 +0000 (30 02:51 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 30 Dec 2009 07:51:38 +0000 (30 02:51 -0500)
treeedefd2ade7f72f0e517fd438ecb061a986906bf6
parentb943aa83f8038959999a6b12e469a875ab245a36
parente01ce79b7f6ebc5b57128ee058811aa8f9059319
Merge branch 'video-error-case' into release
drivers/acpi/video.c