hal: Branch 'master'

[David Zeuthen]

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

New commits:
diff-tree 82f613a96e20a94eb2d174b2baac7bde64df828f (from da67100940c9171124367e0c620498a694e90de9)
Author: Frederic Crozat <fcrozat at mandriva.com>
Date:   Wed May 2 23:57:31 2007 -0400

    add quirk for Dell D420
    
    Even if Bastien has already submitted a similar patch, I prefer to post
    our patch too, just to be sure I don't forget to send all our patches
    here :)

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 441f7d6..da3e2a3 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -3,16 +3,20 @@
   <device>
     <match key="system.hardware.vendor" prefix="Dell">
       <match key="system.hardware.product" prefix="Latitude">
-        <match key="system.hardware.product" contains="D610">
+        <match key="system.hardware.product" contains="D410">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <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="110L">
+        <match key="system.hardware.product" contains="D420">
           <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="D410">
+        <match key="system.hardware.product" contains="D610">
+          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+          <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="110L">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>