hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree 9cb925b5143798f1e0e3081437029ee59f4216a9 (from b9c7a2e5a9c05c4a2b7d73a260f0cd42b9f74efb)
Author: Roy Dragseth <roy.dragseth at cc.uit.no>
Date:   Mon Jul 9 15:25:11 2007 +0100

    add video quirk for ASUS S6F
    
    Here is a patch to make suspend work on ASUS S6F laptops.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index 4922612..12b3dde 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.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.product" prefix="S6F">
+        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+        <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+      </match>
     </match>
     <!-- ASUS a7v600 motherboard, has no usable sys_* entries besides bios_version -->
     <match key="smbios.bios.version" prefix="ASUS A7V600">