hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 723e0c9baf91329e07fc6f71259eb2717d599eb5
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Oct 18 00:48:53 2007 +0200

    Revert "Dell D630 suspend patch"
    
    This reverts commit bace6a2793d5b6d3ce006e664d50357de04ad8b5.
    
    This change add the D630 a second time. Revert the patch for now
    until we know which one is correct

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index d133ef6..35756ae 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -40,9 +40,6 @@
           <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)