hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 41f99ffe94fb8313a43337453054023d0ef7b04f
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Dec 11 13:57:48 2007 +0100

    added suspend quirks for Acer 1694WMLi
    
    Applied adopted version of a patch from Chris Nolan <chris at cenolan.com>
    to add suspend quirks for Acer 1694WMLi. Added the quirks to the existing
    file structure.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index e3c3b79..6e06448 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -48,7 +48,7 @@
       </match>
 
       <match key="system.hardware.product" prefix="Aspire">
-        <match key="system.hardware.product" contains="1690">
+        <match key="system.hardware.product" contains_outof="1690;1694">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
           <merge key="power_management.quirk.no_fb" type="bool">true</merge>