hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree 99716c902a1bf0f19c6b4522520f1722a79aac85 (from 0fefde9d6fc57f27ebb076d49be66fa8b24c5186)
Author: James Ettle <jhe at phys.soton.ac.uk>
Date:   Sat Jul 7 11:02:15 2007 +0100

    add quick for MiTAC 8011 for suspend
    
    Please find attached a quirk patch I use for my MiTAC 8011-based
    notebook, BIOS 1.05. (This is a chassis that may cover a wide variety of
    models sold under various brand names).

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index 8421755..094411b 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -97,6 +97,14 @@
   </device>
 
   <device>
+    <match key="system.hardware.vendor" prefix="MTC">
+      <match key="system.hardware.product" string="Montara-GML">
+        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+      </match>
+    </match>
+  </device>
+
+  <device>
     <match key="system.hardware.vendor" string="MiTAC">
       <!-- Mitac 8350
        system.hardware.product = ''  (string)