hal-info: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi    |    2 +-
 fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi    |    2 +-
 fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi |    2 +-
 fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi     |    4 ++--
 fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi    |    2 +-
 fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi |    4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit c39edfeb8c2486e9362426700727766613570b55
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Mar 18 20:28:28 2008 +0100

    updated suspend quirks with entries from s2ram CVS -r1.119
    
    Updated suspend quirks with entries from s2ram whitelist CVS -r1.119:
    - Acer TravelMate 4400
    - Asus A6J
    - Fujitsu LifeBook T Series
    - IBM T23 (2647)
    - MEDION M295M
    - Toshiba: Satellite A210, TECRA A9

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index 5ca0bbf..f250365 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -24,7 +24,7 @@
         <match key="system.hardware.product" contains="6460">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         </match>
-        <match key="system.hardware.product" contains="C200;2450">
+        <match key="system.hardware.product" contains="C200;2450;4400">
           <merge key="power_management.quirk.none" type="bool">true</merge>
         </match>
 
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index 91b5300..e69932e 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -24,7 +24,7 @@
         <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
       </match>
       <!-- Z91E is identified as A3E -->
-      <match key="system.hardware.product" prefix_outof="A6U;A3E;F3JP">
+      <match key="system.hardware.product" prefix_outof="A6J;A6U;A3E;F3JP">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
       </match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
index f2e21aa..2d6e27d 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
@@ -72,7 +72,7 @@
           <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
 	  -->
         </match>
-        <match key="system.hardware.product" contains_outof="B Series;S7010">
+        <match key="system.hardware.product" contains_outof="B Series;T Series;S7010">
           <merge key="power_management.quirk.none" type="bool">true</merge>
         </match>
       </match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index f46b083..4a987be 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -43,8 +43,8 @@
 	  -->
         </match>
       </match>
-      <!-- R50p, R52, X41t, X40, T30, T41p, T41p, T42, X40, Z60t, X41, Z60m -->
-      <match key="system.hardware.product" prefix_outof="1832;1860;1869;2371;2373;2374;2376;2382;2386;2511;2513;2525;2529;2530">
+      <!-- R50p, R52, X41t, X40, T30, T41p, T41p, T42, X40, Z60t, X41, Z60m, T32 (2647) -->
+      <match key="system.hardware.product" prefix_outof="1832;1860;1869;2371;2373;2374;2376;2382;2386;2511;2513;2525;2529;2530;2647">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index 641fbe7..0f66ee3 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -172,7 +172,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" string="MS-7012">
+      <match key="system.hardware.product" string="MS-7012;M295M">
         <merge key="power_management.quirk.none" type="bool">true</merge>
       </match>
     </match>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
index a8dffc0..bbb1f19 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
@@ -7,7 +7,7 @@
         <match key="system.hardware.product" contains=" M30X">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         </match>
-        <match key="system.hardware.product" contains_outof="M35X;P200; P205D; A100; A105; A135; A200; L30;M70">
+        <match key="system.hardware.product" contains_outof="M35X;P200; P205D; A100; A105; A135; A200; A210; L30;M70">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
           <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
         </match>
@@ -44,7 +44,7 @@
           <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
         </match>
 	<!-- these need no quirks-->
-        <match key="system.hardware.product" contains=" S3; S1">
+        <match key="system.hardware.product" contains=" A9; S3; S1">
           <merge key="power_management.quirk.none" type="bool">true</merge>
         </match>      
       </match>