hal: Branch 'master'

[Richard Hughes]

 fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi |    6 ++++++
 1 files changed, 6 insertions(+)

New commits:
diff-tree a56f07994061e5f9bb543b0959946eb893994790 (from 146d8fe54936d3d7b0e405a8c06c94fca321f7ce)
Author: L. David Baron <dbaron at dbaron.org>
Date:   Wed Jun 13 19:47:30 2007 +0100

    add ThinkPad T21 resume quirk
    
    The attached patch adds a rule for the power management quirk
    (s3_bios) needed to get my IBM T42 laptop (bought in December 2004)
    to suspend.
    
    I tested that suspend+resume works correctly with the s3_bios quirk:
     1. running X with the radeon driver
     2. running X with the proprietary ATI fglrx driver
     3. from tty1 (well, using pm-suspend --quirk-s3-bios rather than the
        quirk coming from hal)
    
    I tested that not having the quirk breaks resume with both the
    radeon and fglrx drivers (didn't try tty1).  I tested that also
    having the s3_mode quirk breaks resume using the fglrx driver
    (didn't try other cases).
    
    This testing was all done on Fedora 7, although using an older X
    server (from Fedora Core 6) that's needed for the fglrx driver.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index f2cffde..89eeda5 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -42,6 +42,12 @@
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
+      <!-- T42 -->
+      <match key="system.hardware.product" prefix="2378">
+        <match key="system.hardware.version" string="ThinkPad T42">
+          <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+        </match>
+      </match>
       <!-- T43 -->
       <match key="system.hardware.product" prefix="2668">
         <match key="system.hardware.version" string="ThinkPad T43">