hal: Branch 'master' - 2 commits

[Richard Hughes]

 fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi   |    2 +-
 fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
diff-tree d94c858ff130a64348c802848a1ba630757d1654 (from b137361d1a3be9cb0b79b747d209f512a3e53ce7)
Author: Richard Hughes <richard at hughsie.com>
Date:   Sun Jul 8 08:50:11 2007 +0100

    fix quirk for dell x300

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 2a70adc..bfe018f 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -59,7 +59,7 @@
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         </match>
         <match key="system.hardware.product" contains="X300">
-          <merge key="power_management.quirk.vmestate_restore" type="bool">true</merge>
+          <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
       </match>
       <match key="system.hardware.product" prefix="Inspiron">
diff-tree b137361d1a3be9cb0b79b747d209f512a3e53ce7 (from 37f99db2ddc708b41c12bf87b9c760f12a2abb32)
Author: Andreas Schneider <mail at cynapses.org>
Date:   Sun Jul 8 08:48:23 2007 +0100

    add video commit fix for T61
    
    attached is a patch to support suspend on my new T61.
    
    gladiac at krikkit:~> lshal | grep system.hardware
      system.hardware.product = '766314G'  (string)
      system.hardware.serial = 'L3B6097'  (string)
      system.hardware.uuid = '25D6E501-4976-11CB-BAFB-F3BEC990E6E0'  (string)
      system.hardware.vendor = 'LENOVO'  (string)
      system.hardware.version = 'ThinkPad T61'  (string)

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index a6a4037..92377d7 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -39,6 +39,10 @@
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
+      <!-- T61 -->
+      <match key="system.hardware.version" string="766314G">
+        <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+      </match>
     </match>
   </device>
 </deviceinfo>