hal-info: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 6e7c467160f0aa6994e8f1744c016752c25825a6
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Oct 1 14:23:10 2008 +0200

    updated Sony suspend quirks with s2ram whitelist entries from -r1.132
    
    Updated Sony suspend quirks with s2ram whitelist entries from -r1.132.
    New:
    - VGN-A115B, VGN-FE21B, VGN-TZ37, VGN-TZ170N
    Fixed:
    - VGN-SZ61XN_C

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
index fc4c571..accbf52 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
@@ -2,19 +2,19 @@
 <deviceinfo version="0.2">
   <device>
     <match key="system.hardware.vendor" string="Sony Corporation">
-      <match key="system.hardware.product" string_outof="VGN-FS115B;VGN-C140G;VGN-TX3XP_L;VGN-T250P;VGN-AR31S;PCV-RX612;VGN-FS485B">
-        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+      <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" contains="PCG-FX601">
+      <match key="system.hardware.product" contains_outof="VGN-FS730;PCG-FX405;VGN-C2S_G;VGN-B1XP;VGN-FE21B">
         <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">
+      <match key="system.hardware.product" string_outof="VGN-FS115B;VGN-C140G;VGN-TX3XP_L;VGN-T250P;VGN-AR31S;PCV-RX612;VGN-FS485B;VGN-SZ61XN_C;VGN-TZ37;VGN-TZ170N">
+        <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="VGN-FS730;PCG-FX405;VGN-C2S_G;VGN-B1XP;VGN-SZ61XN_C">
+      <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-NR120E">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
@@ -47,7 +47,7 @@
       <!-- Note:
            - VGN-FE31M: only from X, S3_MODE hangs the machine, all other leave the screen blank
            - VGN-SZ5XN_C: machine has two gfx cards, works only well with the intel, not with the nvidia -->
-      <match key="system.hardware.product" string_outof="VGN-TX3HP;VGN-B55G(I);VGN-FE31M;VGN-FS215B;VGN-FS660_W;VGN-SZ5XN_C;VGN-TZ21XN_B;PCG-FR215E;VGN-SZ340P;VGN-FE11M;VGN-TZ91HS;PCG-Z505HSK(UC);VGN-FZ39VN">
+      <match key="system.hardware.product" string_outof="VGN-TX3HP;VGN-B55G(I);VGN-FE31M;VGN-FS215B;VGN-FS660_W;VGN-SZ5XN_C;VGN-TZ21XN_B;PCG-FR215E;VGN-SZ340P;VGN-FE11M;VGN-TZ91HS;PCG-Z505HSK(UC);VGN-FZ39VN;VGN-A115B">
 	<merge key="power_management.quirk.none" type="bool">true</merge>
       </match>
       <match key="system.hardware.product" contains_outof="VGN-TZ11;PCG-F430(UC);PCG-GRT916Z;PCG-GRT995MP;PCG-GR7_K(J) ">