hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree 82031b8600fd4a8ed4fd34b17c3225320bb62f86 (from d7b1c28054d5679a7abe65a0df8c24723783de6e)
Author: Alberto Gonzalez <luis6674 at yahoo.com>
Date:   Sun Jul 22 19:19:12 2007 +0100

    add sleep quirk for medion MS-6714
    
    I added my PC to hal-info to make is suspend/resume successfully.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index 27d2d28..8172ea8 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -126,4 +126,13 @@
     </match>
   </device>
 
+  <device>
+    <match key="system.hardware.vendor" prefix="MEDIONPC">
+      <match key="system.hardware.product" contains="MS-6714">
+        <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>