hal: Branch 'master' - 2 commits

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi |    6 ++++++
 fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi   |    3 +++
 2 files changed, 9 insertions(+)

New commits:
diff-tree b6de7d956946b4fd4d696ece39c9f36d3e497481 (from 654bcc0f5bc75f1b5f2a305207333b530107c792)
Author: Frederic Crozat <fcrozat at mandriva.com>
Date:   Mon Aug 27 13:52:03 2007 +0200

    added HP nc4200 video quirk
    
    Add back HP nc4200 with tested quirk.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index 5d44520..c790588 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -54,6 +54,9 @@
         <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         <merge key="power_management.quirk.no_fb" type="bool">true</merge>
       </match>
+      <match key="system.hardware.product" contains="nc4200">
+        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+      </match>
       <match key="system.hardware.product" contains="R4100">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
diff-tree 654bcc0f5bc75f1b5f2a305207333b530107c792 (from 90634f0b6b79dcc0e01f9af1569d69700ab6d1fe)
Author: Rafael Sachetto <rsachetto at gmail.com>
Date:   Mon Aug 27 13:39:50 2007 +0200

    add video quirk for ASUSE F3Sc Notebook
    
    Add video quirk for ASUSE F3Sc Notebook.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index 12b3dde..4286c90 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -41,5 +41,11 @@
       <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" string="F3Sc">
+      <match key="system.hardware.version" string="1.0">
+        <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>