hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree f02be8c9a0fdd37050dad7756f4457f70be60a50 (from 68d56bdac68684faa078f1c18095b2b71b8e0109)
Author: Valent Turkovic <valent.turkovic at gmail.com>
Date:   Tue May 29 17:26:37 2007 +0100

    Add resume quirk for hp nx7300
    
    I got my laptop to suspend/resume with Fedora 7 live CD with kernel
    2.6.21-1.3163.fc7 and here is the quirk submission.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index 5355f6c..a064fb9 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -54,6 +54,10 @@
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
+      <match key="system.hardware.product" contains="nx7300">
+        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+      </match>
     </match>
   </device>
 </deviceinfo>