hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree fc0cb07cb3a754fe3603301c5bfe22be6187b186 (from 3044be7d86fcee550a385cef8a7df4cfc169c349)
Author: David Wilkins <dwilkins at conecuh.com>
Date:   Sat Aug 4 09:21:41 2007 +0100

    add quirk for z60t
    
    This patch adds the z60t to the quirks file

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index 05fe19a..8b7b7c9 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -70,6 +70,11 @@
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
+      <!-- Z60t -->
+      <match key="system.hardware.product" prefix="2513">
+        <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>