hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 0709930d399cee42e81ee141e2b13edc75b9232b
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Nov 9 14:26:47 2007 +0100

    updated suspend quirks for Fujitsu with s2ram commit -r1.115
    
    Updated suspend quirks for Fujitsu with changes in s2ram whitelist from cvs
    commit -r1.115.
    
    Added new:
    - Amilo: Pi 1536
    - Lifebook: E8020
    - ESPRIMO P, SCENIC P / SCENICO P

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
index 1553672..28fb800 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
@@ -11,7 +11,7 @@
           <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="PRO V2030;PRO V8010">
+        <match key="system.hardware.product" contains_outof="PRO V2030;PRO V8010;Pi 1536">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
         </match>
@@ -51,6 +51,10 @@
         <match key="system.hardware.product" contains="E4010">
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
+        <match key="system.hardware.product" contains="E8020">
+          <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="T4210">
           <!-- this need a key we currently not have in HAL:
 	  <merge key="power_management.quirk.pci_restore" type="bool">true</merge>
@@ -64,7 +68,7 @@
       </match>
 
       <match key="system.hardware.product" prefix="SCENIC">
-        <match key="system.hardware.product" contains_outof="N300/N600;W300/W600">
+        <match key="system.hardware.product" contains_outof="N300/N600;W300/W600;P / SCENICO P">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
         </match>
@@ -74,6 +78,10 @@
         </match>
       </match>
 
+      <match key="system.hardware.product" prefix="ESPRIMO P">
+        <merge key="power_management.quirk.none" type="bool">true</merge>
+      </match>
+
       <match key="system.hardware.product" string="Stylistic ST5000">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>