hal-info: Branch 'master'

[Danny Kukawka]

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

New commits:
commit cca6d83a3caea94ce13bb61db801f56a9fead5ab
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Mar 18 16:17:34 2008 +0100

    updated Sony quirks with entries from s2ram CVS -r1.118
    
    Updated Sony quirks with entries from s2ram whitelist CVS -r1.118:
    - added: VGN-AR31S, VGN-FE11M, PCG-FX340, PCG-FX802, PCV-RX612

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
index ca0e4a7..6c89218 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
@@ -2,7 +2,7 @@
 <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">
+      <match key="system.hardware.product" string_outof="VGN-FS115B;VGN-C140G;VGN-TX3XP_L;VGN-T250P;VGN-AR31S;PCV-RX612">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
@@ -22,6 +22,13 @@
       <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>
+      <match key="system.hardware.product" contains="PCG-FX340">
+	<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+      </match>
+      <match key="system.hardware.product" contains="PCG-FX802">
+	<merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+	<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+      </match>
       <match key="system.hardware.product" contains="PCG-Z1RMP">
 	<merge key="power_management.quirk.vbe_post" type="bool">true</merge>
 	<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
@@ -31,7 +38,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">
+      <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">
 	<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) ">