hal-info: Branch 'master'

[Martin Pitt]

 fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 374c0cd7fb4a5e88775e62711df3e346211489ae
Author: Bruce Tulloch <bruce at causal.com>
Date:   Thu Feb 26 08:53:30 2009 +0100

    fix suspend quirks on Dell Inspiron 8600
    
    Fix suspend quirks on Dell Inspiron 8600, as reported on the hal ML.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 16dfc51..4df9d43 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -54,7 +54,7 @@
 
       <!-- Dell Inspiron -->
       <match key="system.hardware.product" prefix="Inspiron">
-        <match key="system.hardware.product" contains="1501">
+        <match key="system.hardware.product" contains_outof="1501;8600">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
           <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
         </match>
@@ -75,9 +75,6 @@
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
-        <match key="system.hardware.product" contains="8600">
-          <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
-        </match>
         <match key="system.hardware.product" contains_outof="500m;600m;1100;1420;1525;2200;5160">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>