hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi |   33 +++++++++++--
 1 file changed, 28 insertions(+), 5 deletions(-)

New commits:
commit 7e3a81e6df451fd9529cec4851f67c5f9cf2a15a
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Oct 23 13:15:49 2007 +0200

    updated quirks for Lenovo machines with entries from the s2ram whitelist
    
    Updated quirks for Lenovo machines with entries from the s2ram whitelist.
    Added several new entries for: X60/X60s, X61, z61p, T61*, R61 and added
    new section for Lenovos non-ThinkPads.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index b0a4c1c..67d4bb6 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -2,13 +2,15 @@
 <deviceinfo version="0.2">
   <device>
     <match key="system.hardware.vendor" string="LENOVO">
+    <!-- ThinkPads -->
+
       <!-- X60 / X60s -->
-      <match key="system.hardware.product" prefix_outof="1702;1704;1706;1709">
+      <match key="system.hardware.product" prefix_outof="1702;1704;1706;1709;6363;6364;">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
-      <!-- X61 Tablet -->
-      <match key="system.hardware.product" prefix_outof="7764;7675">
+      <!-- X61* Tablet -->
+      <match key="system.hardware.product" prefix_outof="7669;7764;7675">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
       </match>
       <match key="system.hardware.product" prefix="63664DU">
@@ -27,16 +29,27 @@
           <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.version" contains_outof="T60p;Z61m;Z61t;Z60m">
+        <match key="system.hardware.version" contains_outof="T60p;Z61m;Z61t;Z60m;Z61p">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
           <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
         </match>
       </match>
 
       <!-- T61 -->
-      <match key="system.hardware.version" string="766314G">
+      <match key="system.hardware.product" string="7663">
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
+      <match key="system.hardware.product" prefix_outof="7658;8895">
+	<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+	<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+      </match>
+
+      <!-- R61 -->
+      <match key="system.hardware.product" prefix="8919">
+	<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+	<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+      </match>
+      
 
       <!-- X61 Tablet , system.hardware.version='ThinkPad X61 Tablet' -->
       <match key="system.hardware.product" string="7767C3U">
@@ -44,6 +57,16 @@
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
 
+    <!-- Lenovos non-ThinkPads -->
+      <match key="system.hardware.version" prefix_ncase="3000 N100">
+        <match key="system.hardware.product" prefix_outof="07686VG;076831G;076835U">
+          <merge key="power_management.quirk.none" type="bool">true</merge>
+        </match>
+        <match key="system.hardware.product" prefix="07687MM">
+	  <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+        </match>
+      </match>
+
     </match>
   </device>
 </deviceinfo>