hal: Branch 'master'

[Sjoerd Simons]

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

New commits:
commit 81d64d03f611cf99e3049b0b4322b1c566bc1ebc
Author: Sjoerd Simons <sjoerd at luon.net>
Date:   Sun Dec 2 14:37:42 2007 +0100

    add video quirks for HP Compaq 6710b.
    
    Added video quirks for HP Compaq 6710b laptops as reported by Michal Sojka in
    the debian bugtracking system.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index 498d09c..2fb66cf 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -50,7 +50,10 @@
     </match>
 
     <match key="system.hardware.vendor" prefix="Hewlett-Packard">
-
+      <match key="system.hardware.product" contains="6710b (GB893EA#">
+          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+          <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+      </match>
       <match key="system.hardware.product" contains_outof="V2000 (EP381UA#;X1000 (DK454AV)">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
       </match>