hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 69313a1aeb6d04d67e357464d4c139633865b8eb
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Nov 9 13:19:09 2007 +0100

    updated suspend quirks for Asus with s2ram commit -r1.115
    
    Updated suspend quirks for Asus with changes in s2ram whitelist from cvs
    commit -r1.115.
    
    Added new:
    - F3F, U5F

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index 7c87e3a..f1c2c7a 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -2,10 +2,13 @@
 <deviceinfo version="0.2">
   <device>
     <match key="system.hardware.vendor" prefix="ASUS">
+      <match key="system.hardware.product" prefix="U5F ">
+        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+      </match>
       <match key="system.hardware.product" prefix_outof="K8N-E-Deluxe;L2000D;M6Ne;V6V">
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
-      <match key="system.hardware.product" prefix_outof="M6VA;M6N ;M5N;M7A;S6F;S5N ;W3A;W5A ;M2N ;A2D ">
+      <match key="system.hardware.product" prefix_outof="M6VA;M6N ;M5N;M7A;S6F;S5N ;W3A;W5A ;M2N ;A2D ;F3F ">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>