hal: Branch 'origin' - 2 commits

[Richard Hughes]

 fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi |    7 +++++++
 fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi |    9 +++++++++
 2 files changed, 16 insertions(+)

New commits:
diff-tree b68097f2997d57bf1be81b7b0810c87254f46e4f (from d90c832ba2353c12008c2ff02396613337ec8de2)
Author: David Zeuthen <davidz at redhat.com>
Date:   Tue Jul 3 18:01:29 2007 -0400

    add quirk for Dell Precision M65 laptop

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 0a7c229..f9cc6c3 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -2,6 +2,13 @@
 <deviceinfo version="0.2">
   <device>
     <match key="system.hardware.vendor" prefix="Dell">
+      <match key="system.hardware.product" prefix="Precision">
+        <match key="system.hardware.product" contains="M65">
+          <merge key="power_management.quirk.dpms_on" type="bool">true</merge>
+          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+          <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+        </match>
+      </match>
       <match key="system.hardware.product" prefix="Latitude">
         <match key="system.hardware.product" contains="C600">
           <merge key="power_management.quirk.radeon_off" type="bool">true</merge>
diff-tree d90c832ba2353c12008c2ff02396613337ec8de2 (from d2f814dfe71cd13daf66188ab6360b3b73280c99)
Author: Olivier Blin <blino at mandriva.com>
Date:   Tue Jul 3 18:17:24 2007 +0100

    add Elonex z3300a to the sleep quirk list
    
    The attached patch (from Arnaud Patard) adds some quirks for the
    Elonex z3300a laptop (reported as M5A by the BIOS)

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index 9294183..4ed56cb 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -87,4 +87,13 @@
     </match>
   </device>
 
+  <device>
+    <match key="system.hardware.vendor" prefix="Elonex PLC">
+      <match key="system.hardware.product" contains="M5A">
+        <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>