hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree fca27b96eb970f9519b1cacb7a55c157dff4feac (from 3d6b1649f772310dba7e67a60bbf0b061524cecf)
Author: Emil Soleyman <emil at soleyman.com>
Date:   Sun Aug 19 18:01:27 2007 +0100

    add video quirk for Z61t
    
    I have found a video quirk when suspending and resuming my Lenovo Z61t.
    I am attaching a patch that will update hal-info.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index 92377d7..f33dc74 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>
+      <match key="system.hardware.version" string="ThinkPad Z61t">
+        <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>