hal-info: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 71e653c0901c555c25c373fba5db6430f2158672
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Apr 14 19:29:46 2008 +0200

    fixed some *_outof matches
    
    Fixed some *_outof matches, added _outof where matches are used
    for different values separated by ';'.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index f250365..fce5ef2 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;4400">
+        <match key="system.hardware.product" contains_outof="C200;2450;4400">
           <merge key="power_management.quirk.none" type="bool">true</merge>
         </match>
 
@@ -98,7 +98,7 @@
         <match key="system.hardware.product" contains="6220">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         </match>
-        <match key="system.hardware.product" contains="2900;4150">
+        <match key="system.hardware.product" contains_outof="2900;4150">
           <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-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index e69932e..2dc4fec 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -66,7 +66,7 @@
       <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
     </match>
     <!-- another ASUS Mainboard, this need no quirk -->
-    <match key="system.firmware.version" prefix="ASUS M2N-E ACPI BIOS Revision;ASUS Striker ACPI BIOS Revision">
+    <match key="system.firmware.version" prefix_outof="ASUS M2N-E ACPI BIOS Revision;ASUS Striker ACPI BIOS Revision">
       <merge key="power_management.quirk.none" type="bool">true</merge>
     </match>
 
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 9682957..8147cae 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -59,7 +59,7 @@
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
-        <match key="system.hardware.product" contains="500m;600m;1100">
+        <match key="system.hardware.product" contains_outof="500m;600m;1100">
           <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-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index 6ef950b..c2afabc 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -177,7 +177,7 @@
           </match>
         </match>
         <match key="system.hardware.product" contains=" dv6000 ">
-          <match key="system.hardware.version" contains="(GA378UA#;(GH907EA#">
+          <match key="system.hardware.version" contains_outof="(GA378UA#;(GH907EA#">
 	    <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
           </match>
 	  <!-- note: (RP153UA#: suspend maybe only with binary nvidia module -->
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index 95c857e..d499808 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -33,7 +33,7 @@
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
       <!-- X31 -->
-      <match key="system.hardware.product" prefix="2672;2673">
+      <match key="system.hardware.product" prefix_outof="2672;2673">
         <match key="system.hardware.version" contains="X31">
           <merge key="power_management.quirk.dpms_suspend" type="bool">true</merge>
           <!-- already added above
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index 459e40c..8006305 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;M295M">
+      <match key="system.hardware.product" string_outof="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 bbb1f19..d4f39af 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
@@ -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=" A9; S3; S1">
+        <match key="system.hardware.product" contains_outof=" A9; S3; S1">
           <merge key="power_management.quirk.none" type="bool">true</merge>
         </match>      
       </match>