hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi |   19 ++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

New commits:
commit e5c0fd03f34b7cdcd2409712ed87861e7f5aa915
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Mar 18 13:52:19 2008 +0100

    updated Acer quirks with entries from s2ram CVS -r1.118
    
    Updated Acer quirks with entries from s2ram whitelist CVS -r1.118:
    - new match for Aspire: 5610 to differ between existing entry and 5610Z
    - updated: Aspire 1640
    - new: Extensa 2900

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index c809639..08a05a1 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -69,14 +69,27 @@
           <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_outof="5610;5020;5500">
+        <match key="system.hardware.product" contains="5610">
+          <!-- report from s2ram for a 5610Z, not sure if the 5610 is the same, so do this check -->
+	  <match key="system.hardware.product" contains="5610Z">
+            <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_not="5610Z">
+            <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+          </match>
+        </match>
+        <match key="system.hardware.product" contains_outof="5020;5500">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         </match>
+        <match key="system.hardware.product" contains="1640">
+          <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+        </match>
         <match key="system.hardware.product" contains_outof="1520;3000;5110;5570;5920">
           <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="1640;3100;5500Z;5580">
+        <match key="system.hardware.product" contains_outof="3100;5500Z;5580">
           <merge key="power_management.quirk.none" type="bool">true</merge>
         </match>
       </match>
@@ -85,7 +98,7 @@
         <match key="system.hardware.product" contains="6220">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         </match>
-        <match key="system.hardware.product" contains="4150">
+        <match key="system.hardware.product" contains="2900;4150">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
           <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
         </match>