hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 6ed0deac15d8246ef9657669128093c844e476ae
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Dec 3 15:09:12 2007 +0100

    cleanup, reuse existing entries
    
    Cleaned up existing entry to reuse already existing matches/quirks.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index bfc3281..5737eb9 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -50,10 +50,6 @@
     </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>
@@ -69,7 +65,7 @@
         <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_outof="nc2400;nc6120;nc6320;nx7300;nw8440">
+      <match key="system.hardware.product" contains_outof="nc2400;nc6120;nc6320;nx7300;nw8440;6710b">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
       </match>
@@ -81,7 +77,6 @@
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
       </match>
 
-
       <match key="system.hardware.product" contains="HP Compaq nc6400 ">
         <match key="system.hardware.version" prefix="68YCU">
           <match key="system.hardware.product" contains="(EH522AV)">