hal: Branch 'master'

[Richard Hughes]

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

New commits:
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>