hal: Branch 'master'

[David Zeuthen]

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

New commits:
diff-tree 036b57bbb0887096d626119e925207389a2fa9b3 (from dc3049d260cccc02305ccda42e01bd93fcb204dd)
Author: Frederic Crozat <fcrozat at mandriva.com>
Date:   Wed May 2 23:46:48 2007 -0400

    add quirk for Lenovo Thinkpad Z61m

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index 2dac02e..5fb237f 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -31,6 +31,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 Z61m">
+        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+        <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+      </match>
     </match>
   </device>
 </deviceinfo>