hal-info: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 6e383c239d00ac099b67fc31b7f61b41fcd93245
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Mar 18 15:38:44 2008 +0100

    updated HP quirks with entries from s2ram CVS -r1.118
    
    Updated HP quirks with entries from s2ram whitelist CVS -r1.118:
    - added: 6720s, 8710p, an other nc6400, an other Pavilion dv6000,
             Pavilion zd8000

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index 9f0baa8..6ef950b 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -95,7 +95,7 @@
         <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
       </match>
       <!-- Note: PY507ET# is a nc6120 -->
-      <match key="system.hardware.product" contains_outof="nc2400;nc6120;nc6320;nx7300;nw8440;6710b;6910p;8510p;PY507ET#">
+      <match key="system.hardware.product" contains_outof="nc2400;nc6120;nc6320;nx7300;nw8440;6710b;6720s;6910p;8510p;PY507ET#">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
       </match>
@@ -109,7 +109,7 @@
 
       <match key="system.hardware.product" contains="HP Compaq nc6400 ">
         <match key="system.hardware.version" prefix="68YCU">
-          <match key="system.hardware.product" contains_outof="(EH522AV);(EY582ES">
+          <match key="system.hardware.product" contains_outof="(EH522AV);(EY582ES;(RH560EA">
             <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
             <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
 	  </match>
@@ -156,6 +156,9 @@
         <match key="system.hardware.product" contains="dv4000 (EB911EA#">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
 	</match>
+        <match key="system.hardware.product" contains="zd8000 (EL030EA#">
+          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        </match>
 	<match key="system.hardware.product" contains="ze2000">
 	  <match key="system.hardware.product" contains="(EK791EA#">
 	    <merge key="power_management.quirk.none" type="bool">true</merge>
@@ -174,7 +177,7 @@
           </match>
         </match>
         <match key="system.hardware.product" contains=" dv6000 ">
-          <match key="system.hardware.version" contains="(GA378UA#">
+          <match key="system.hardware.version" contains="(GA378UA#;(GH907EA#">
 	    <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
           </match>
 	  <!-- note: (RP153UA#: suspend maybe only with binary nvidia module -->
@@ -187,7 +190,7 @@
           </match>
         </match>
         
-        <match key="system.hardware.product" contains_outof="dv2000;dv2500;tx1000;dv5000 (EZ535UA#;HP Pavilion dv6500 Notebook PC ">
+        <match key="system.hardware.product" contains_outof="8710p;dv2000;dv2500;tx1000;dv5000 (EZ535UA#;HP Pavilion dv6500 Notebook PC">
           <merge key="power_management.quirk.none" type="bool">true</merge>
         </match>
       </match>