hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree f4b7cdba4aeefca32c59532c3ec14249a778db9a (from 4f6397a058e5185414be0611c4c783bbc1a845c2)
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed May 23 17:33:46 2007 +0100

    fix dell d620 video quirk
    
    >Fixes resume for me (in X anyway), console is still blank after resume
    (haven't gotten that to work with any combination of quirks yet).

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 5f04f9b..e0c1a9b 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -18,6 +18,10 @@
           <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="D620">
+          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+          <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+        </match>
         <match key="system.hardware.product" contains="D800">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>