hal-info: Branch 'master'

[Martin Pitt]

 fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 74c4ada97c630ace64e4b2aa0eeda904a9f8716e
Author: Alexey Fisher <bug-track at fisher-privat.net>
Date:   Fri Feb 20 12:39:22 2009 +0100

    fix suspend quirks for Asus P5LD2
    
    Fix suspend quirks for Asus P5LD2; the previous attempt in commit
    aa6ce4cda407b9038dcf4c711274d517b8e92045 did not actually work.
    
    Reported on the upstream ML.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index ee7f8e4..d3f4337 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -9,7 +9,7 @@
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
       <!--NOTE: s2ram list the F3F with power_management.quirk.none=true -->
-      <match key="system.hardware.product" prefix_outof="M6VA;M6N ;M5N;M7A;S6F;S5N ;W3A;W5A ;M2N ;A2D ;F3F ;V6V;P5LD2;A8He;A6Kt ;F3JC ;F3Sc">
+      <match key="system.hardware.product" prefix_outof="M6VA;M6N ;M5N;M7A;S6F;S5N ;W3A;W5A ;M2N ;A2D ;F3F ;V6V;A8He;A6Kt ;F3JC ;F3Sc">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
@@ -75,6 +75,11 @@
       </match>
     </match>
 
+    <!-- Board with broken system.hardware.* fields. Use system.board.* instead -->
+    <match key="system.board.product" prefix="P5LD2">
+      <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+    </match>
+
     <!-- ASUS a7v600 motherboard, has no usable sys_* entries besides bios_version -->
     <match key="system.firmware.version" prefix="ASUS A7V600">
       <merge key="power_management.quirk.s3_bios" type="bool">true</merge>