hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 5043525affcb1a1110ef045915bb0e2a89219feb
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Oct 31 13:34:33 2007 +0100

    fixed entry for Dell Latitude D620
    
    Fixed entry fro the Dell Latitude D620. Use now vbe_post+vbemode_restore
    which should work with intel x.org driver >= 2.x.x on ix86 and x86_64,
    while vbe_post+vbestate_restore don't work with ix86.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 4c00b3a..18739cd 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -21,11 +21,11 @@
         <match key="system.hardware.product" contains="D400">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         </match>
-        <match key="system.hardware.product" contains_outof="CPx J800GT;D410;D420;D520;C610">
+        <match key="system.hardware.product" contains_outof="CPx J800GT;D410;D420;D520;C610;D620">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
         </match>
-        <match key="system.hardware.product" contains_outof="C400;D500;D505;D620;D800;X200">
+        <match key="system.hardware.product" contains_outof="C400;D500;D505;D800;X200">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>