hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree 79fdf06d035318c2c725275bbb4b5b3d32355ca3 (from 0133c683d606a17c274495700a91a2d4219bbf7f)
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue May 22 15:36:36 2007 +0100

    adds3_{bios,mode} quirks for IBM ThinkPad T43.
    
    Add a trivial patch to enable the s3_{bios,mode} quirks for my ThinkPad
    T43. Patch by Luke Macken <lmacken at redhat.com>.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index e368e54..326ea54 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -38,13 +38,20 @@
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
-      <!-- G40 -->
+      <!-- T43 -->
       <match key="system.hardware.product" prefix="2668">
         <match key="system.hardware.version" string="ThinkPad T43">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
           <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
         </match>
       </match>
+      <match key="system.hardware.product" prefix="1871">
+        <match key="system.hardware.version" string="ThinkPad T43">
+          <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+          <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+        </match>
+      </match>
+      <!-- G40 -->
       <match key="system.hardware.product" prefix="2388">
         <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
       </match>