hal: Branch 'master'

[Richard Hughes]

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

New commits:
commit bace6a2793d5b6d3ce006e664d50357de04ad8b5
Author: Pawel Salek <pawsa at theochem.kth.se>
Date:   Wed Oct 17 22:38:25 2007 +0100

    Dell D630 suspend patch
    
    Please find attached patch needed to get the graphical mode restore to
    work after suspend on Dell Latitude D630. I observe that suspend does
    not work if I close the lid at the login screen, or in the text mode.
    Otherwise, I have tested it a number of times, rebooting the laptops
    few times in between.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 35756ae..d133ef6 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -40,6 +40,9 @@
           <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="D630">
+          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        </match>
         <match key="system.hardware.product" contains="D820">
           <!-- ONLY needed with i810 X.org driver 1.x versions,
                DO NOT use with intel X.org driver 2.x version (not needed and causes problems)