hal-info: Branch 'master'

[Danny Kukawka]

 VERSION                                                 |    2 +-
 fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi |    7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 395ac494d76dfd0edf4ec077b3484b530e20742e
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Oct 1 14:04:11 2008 +0200

    updated IBM suspend quirks with s2ram whitelist entries from -r1.132
    
    Updated IBM suspend quirks with s2ram whitelist entries from -r1.132.
    
    Fixed entry for a X31 (2673), use s3_bios/s3_mode and not radeon_off since
    there are reports that this makes the second suspend fail.
    
    Note: If there are problems with this change, please report the full output
          of 'lshal -lu /org/freedesktop/Hal/devices/computer' of the machine.

diff --git a/VERSION b/VERSION
index ae5c712..0609cb2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-20080508
+20080930
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index f8d96f3..a5a4f05 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -29,7 +29,12 @@
 
       <!-- A31-->
       <match key="system.hardware.product" prefix="2652">
-        <merge key="power_management.quirk.radeon_off" type="bool">true</merge>
+        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+        <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+        <!-- 
+          There are reports that this quirk makes 2652 crash/fail on second suspend (bnc#309742)
+	  <merge key="power_management.quirk.radeon_off" type="bool">true</merge> 
+        -->
         <merge key="power_management.quirk.dpms_suspend" type="bool">true</merge>
       </match>
       <!-- X31, T30 , A31p-->