hal: Branch 'master' - 2 commits

[David Zeuthen]

 fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi |   52 +--------------
 fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi   |    6 -
 2 files changed, 4 insertions(+), 54 deletions(-)

New commits:
diff-tree dc3049d260cccc02305ccda42e01bd93fcb204dd (from a125958c38efdeedc553f1087e2ec26aa6b9d1e7)
Author: David Zeuthen <davidz at redhat.com>
Date:   Wed May 2 23:44:29 2007 -0400

    add back quirk for Dell D410

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 39556d4..441f7d6 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -12,6 +12,10 @@
           <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">
+          <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="D510">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
diff-tree a125958c38efdeedc553f1087e2ec26aa6b9d1e7 (from 272d44f2ae64583483bd1250cec3ff11c679a796)
Author: Frederic Crozat <fcrozat at mandriva.com>
Date:   Wed May 2 23:44:05 2007 -0400

    remove duplicate quirks

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 9c035c9..39556d4 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -28,26 +28,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="110L">
-          <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">
-          <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="D510">
-          <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="D810">
-          <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="X300">
-          <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>
@@ -90,34 +70,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="700m">
-          <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="1200">
-          <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="6000">
-          <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="8100">
-          <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="8200">
-          <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="8600">
-          <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="9300">
-          <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="5150">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index fb972a6..4f62a9c 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -16,12 +16,6 @@
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
       </match>
-      <match key="system.hardware.product" contains="nx5000">
-        <match key="system.firmware.version" prefix="68BCU">
-          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
-          <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
-        </match>
-      </match>
       <match key="system.hardware.product" contains="nc6000">
         <match key="system.firmware.version" prefix="68BDD">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>