hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree 7da206cdc4df410d90553ea84ddbd7c228e84d5a (from 8f466e212fbf39ce1250a085e2db7b1c59de3d5f)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Sep 19 13:07:03 2007 +0200

    added video quirks for Dell XPS M1330
    
    Added video quirks for Dell XPS M1330, needed to resume from SuspendToRam
    from X and init=/bin/bash.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 0ef0aa3..674f511 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -82,6 +82,11 @@
       <match key="system.hardware.product" prefix="MXC062">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
       </match>
+      <!-- Dell XPS M1330 -->
+      <match key="system.hardware.product" string="XPS M1330">
+          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+          <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+      </match>
     </match>
   </device>
 </deviceinfo>