hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree 37f99db2ddc708b41c12bf87b9c760f12a2abb32 (from 1c2c2b47596e4be97b603e2fd1b8e57b0d3192b4)
Author: Jim Radford <radford at blackbean.org>
Date:   Sat Jul 7 18:26:29 2007 +0100

    add video quirk for dell latitude x300
    
    With this quirk, suspend works for me on my Dell Latitude X300 in f7
    if I also remove these usb modules first.
    
       SUSPEND_MODULES=ehci_hcd

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index f9cc6c3..2a70adc 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -58,6 +58,9 @@
         <match key="system.hardware.product" suffix="X1">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         </match>
+        <match key="system.hardware.product" contains="X300">
+          <merge key="power_management.quirk.vmestate_restore" type="bool">true</merge>
+        </match>
       </match>
       <match key="system.hardware.product" prefix="Inspiron">
         <match key="system.hardware.product" contains="5150">