hal-info: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi |   16 ++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 4f23328452f20c704a3e7a28dfb2f8cc797da3ca
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Mar 18 16:20:12 2008 +0100

    updated misc quirks with entries from s2ram CVS -r1.118
    
    Updated misc quirks with entries from s2ram whitelist CVS -r1.118:
    - COMPAL HEL80I
    - Matsushita Electric: CF-R6A
    - AVERATEC: 5500 Series
    - Medion: MS-7012
    - Shuttle Inc.: SN41UV10

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index b311d12..b55aa0b 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -2,7 +2,7 @@
 <deviceinfo version="0.2">
   <device>
     <match key="system.hardware.vendor" prefix="COMPAL">
-      <match key="system.hardware.product" contains_outof="HEL80I;HEL81I">
+      <match key="system.hardware.product" contains_outof="HEL80C;HEL80I;HEL81I">
         <merge key="power_management.quirk.none" type="bool">true</merge>
       </match>
     </match>
@@ -42,7 +42,7 @@
       <match key="system.hardware.product" prefix="CF-Y">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
       </match>
-      <match key="system.hardware.product" contains_outof="CF-51E;CF-R3E;CF-R2C;CF-R6M">
+      <match key="system.hardware.product" contains_outof="CF-51E;CF-R3E;CF-R2C;CF-R6A;CF-R6M">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
       </match>
@@ -69,6 +69,9 @@
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
+      <match key="system.hardware.product" string="5500 Series">
+        <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+      </match>
     </match>
   </device>
 
@@ -169,6 +172,9 @@
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
+      <match key="system.hardware.product" string="MS-7012">
+        <merge key="power_management.quirk.none" type="bool">true</merge>
+      </match>
     </match>
   </device>
 
@@ -362,9 +368,13 @@
 
   <device>
     <match key="system.hardware.vendor" string="Shuttle Inc">
-      <match key="system.hardware.product" prefix="SN85V10">
+      <match key="system.hardware.product" string="SN85V10">
         <merge key="power_management.quirk.none" type="bool">true</merge>
       </match>
+      <match key="system.hardware.product" string="SN41UV10">
+        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+      </match>
     </match>
   </device>