hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree 86b8417a8757a0d679c75bde7b8082a8cddaef86 (from c4b358abcf2e627109426db222c94244e4115124)
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Jun 5 10:21:51 2007 +0100

    add quirk for Dell E1505
    
    Add a quirk for Dell E1505, patch originally supplied by
    John H. <mistamaila at gmail.com> but demangled by me.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 37bc130..62a033d 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -44,8 +44,8 @@
           <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">
-	<!-- ONLY needed with i810 X.org driver 1.x versions,
+        <match key="system.hardware.product" contains="700m">
+        <!-- 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)
 	     <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
 	     <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
@@ -57,6 +57,11 @@
           <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="MM061">
+          <merge key="power_management.quirk.dpms_on" type="bool">true</merge>
+          <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>
   </device>