hal-info: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 3b87a91f1e393822fc85bd288fbef4c2db8892f1
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Oct 1 14:18:32 2008 +0200

    updated Toshiba suspend quirks with s2ram whitelist entries from -r1.132
    
    Updated Toshiba suspend quirks with s2ram whitelist entries from -r1.132.
    New:
    - Satellite: M105, Pro A120, Pro U300, U 200

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
index 5feb4e3..4120291 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;P100;P200; P205D; A100; A105; A135; A200; A210; L30;M70">
+        <match key="system.hardware.product" contains_outof="Pro A120;M35X;P100;P200; P205D; A100; A105; A135; A200; A210; L30; M105;M70">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
           <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
         </match>
@@ -41,7 +41,7 @@
           <merge key="power_management.quirk.dpms_on" type="bool">true</merge>
         </match>
 	<!-- these need no quirks-->
-        <match key="system.hardware.product" contains_outof="A80;Pro4600">
+        <match key="system.hardware.product" contains_outof="A80;Pro4600; U200;Pro U300">
           <merge key="power_management.quirk.none" type="bool">true</merge>
         </match>
       </match>