hal-info: Branch 'master' - 2 commits

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi   |    4 ++--
 fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi |    9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit f2cdbb3db1fc27d4d22a0b7d444f8b0c2ff7f6cd
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Jan 16 15:10:36 2009 +0100

    add suspend quirk for a Lenovo Thinkpad w500
    
    Added suspend quirk for a Lenovo Thinkpad w500 as reported
    by Walter Landry <wlandry at caltech.edu>.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index c565b9e..39c7504 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -30,16 +30,23 @@
         </match>
       </match>
 
-      <!-- T60*, Z61*, R61e -->
       <match key="system.hardware.version" prefix="ThinkPad ">
+        <!-- T60* -->
         <match key="system.hardware.version" suffix="T60">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
           <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
         </match>
+        <!-- Z61*, R61e ... -->
         <match key="system.hardware.version" contains_outof="T60p;Z61m;Z61t;Z60m;Z61p;R61e">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
           <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
         </match>
+        <!-- W500 -->
+        <match key="system.hardware.version" suffix="W500">
+          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        </match>
+      </match>
+
       </match>
 
       <!-- T61 -->
commit 966de8c3aa62e3207a6985b5238f3a7b1dc1a613
Author: Richard Schwarting <aquarichy at gmail.com>
Date:   Fri Jan 16 15:00:07 2009 +0100

    add suspend quirk for a Acer TravelMate C100
    
    Added suspend quirk for a Acer TravelMate C100:
    
      system.hardware.product = 'TravelMate C100'  (string)
      system.hardware.vendor = 'ACER'  (string)
      system.hardware.version = '-1'  (string)

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index 1d6c514..3129ca8 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
 <deviceinfo version="0.2">
   <device>
-    <match key="system.hardware.vendor" prefix="Acer">
+    <match key="system.hardware.vendor" prefix_ncase="Acer">
       <match key="system.hardware.product" prefix="TravelMate">
         <match key="system.hardware.product" contains="C300">
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
@@ -21,7 +21,7 @@
         <match key="system.hardware.product" contains_outof="7520;8000">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         </match>
-        <match key="system.hardware.product" contains="6460">
+        <match key="system.hardware.product" contains_outof="C100;6460">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         </match>
         <match key="system.hardware.product" contains_outof="C200;2450;4400;6492">