hal: Branch 'master'

[David Zeuthen]

 fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi |    7 +++++++
 1 files changed, 7 insertions(+)

New commits:
diff-tree da67100940c9171124367e0c620498a694e90de9 (from 036b57bbb0887096d626119e925207389a2fa9b3)
Author: Frederic Crozat <fcrozat at mandriva.com>
Date:   Wed May 2 23:47:59 2007 -0400

    add quirk for Maxdata 6100

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index d10081b..efe3896 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -25,6 +25,13 @@
     </match>
   </device>
   <device>
+    <match key="system.hardware.vendor" contains="MAXDATA">
+      <match key="system.hardware.product" contains="Pro 6100X">
+        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+      </match>
+    </match>
+  </device>
+  <device>
     <match key="system.hardware.vendor" contains="Matsushita">
       <match key="system.hardware.product" contains="CF-51E">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>