hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi |   17 +++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

New commits:
commit b29230cd02bae8ed74aa72bbd91a82d3d28a9aad
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Nov 8 15:08:45 2007 +0100

    updated suspend quirks for Sony with entries from the s2ram whitelist
    
    Updated suspend quirks for Sony with entries from the s2ram whitelist.
    
    Added new:
    - VGN-C140G, VGN-TX3XP_L, PCG-FX601, PCG-FX405, PCG-TR2A(UC), VGN-UX50
    
    Whitelisted (need no quirks):
    - VGN-B55G(I), VGN-FE31M, VGN-FS215B, VGN-FS660_W, PCG-F430(UC)*,
      PCG-GRT916Z*, PCG-GRT995MP*, PCG-GR7_K(J)*

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
index 04231cf..f5f4df6 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
@@ -2,25 +2,30 @@
 <deviceinfo version="0.2">
   <device>
     <match key="system.hardware.vendor" string="Sony Corporation">
-      <match key="system.hardware.product" string="VGN-FS115B">
+      <match key="system.hardware.product" string_outof="VGN-FS115B;VGN-C140G;VGN-TX3XP_L">
+        <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="PCG-FX601">
         <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" string="VGN-FS115Z">
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
-      <match key="system.hardware.product" string="VGN-FS730">
+      <match key="system.hardware.product" contains_outof="VGN-FS730;PCG-FX405">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
       </match>
-      <match key="system.hardware.product" string="VGN-TX5MN_W">
+      <match key="system.hardware.product" string_outof="VGN-TX5MN_W;PCG-TR2A(UC);VGN-UX50">
 	<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
       </match>
 
-      <!---> machines which need no quirks -->
-      <match key="system.hardware.product" string_outof="VGN-TX3HP">
+      <!-- machines which need no quirks -->
+      <!-- VGN-FE31M: only from X, S3_MODE hangs the machine, all other leave the screen blank -->
+      <match key="system.hardware.product" string_outof="VGN-TX3HP;VGN-B55G(I);VGN-FE31M;VGN-FS215B;VGN-FS660_W">
 	<merge key="power_management.quirk.none" type="bool">true</merge>
       </match>
-      <match key="system.hardware.product" contains="VGN-TZ11">
+      <match key="system.hardware.product" contains_outof="VGN-TZ11;PCG-F430(UC);PCG-GRT916Z;PCG-GRT995MP;PCG-GR7_K(J) ">
 	<merge key="power_management.quirk.none" type="bool">true</merge>
       </match>
     </match>