hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree fb53fe8291894623c1f478f3c49dbd96ad592a17 (from 649f637536a05756f1b0e90290084baaa36c7365)
Author: Erwan Velu <erwan at seanodes.com>
Date:   Fri Aug 31 18:52:21 2007 +0200

    add Lenovo ThinkPad Z60m video quirk
    
    Added Lenovo ThinkPad Z60m video quirks.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index b7c0520..a0a36a8 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -23,7 +23,7 @@
           <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">
+        <match key="system.hardware.version" contains_outof="T60p;Z61m;Z61t;Z60m">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
           <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
         </match>