hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree c832d5ad0003827a433986b679cfaf33c8b4ae23 (from 61d218bf119d779335a70bcbfba36f053886982b)
Author: Chuck Anderson <cra at WPI.EDU>
Date:   Sun Sep 30 18:32:41 2007 +0100

    I just tested this modification and it works on my IBM Thinkpad T42p
    for suspend/resume.  Prior to this I had to use the kernel command
    line parameter 'acpi_sleep=s3_bios'.
    
    Can you please add this patch?
    
    Here is the relevant system.hardware:
    
    >lshal | grep system.hardware
      system.hardware.primary_video.product = 20052  (0x4e54)  (int)
      system.hardware.primary_video.vendor = 4098  (0x1002)  (int)
      system.hardware.product = '2379DYU'  (string)
      system.hardware.serial = '99M3229'  (string)
      system.hardware.uuid = 'BC7F8801-4763-11CB-88B1-9855E2229085'  (string)
      system.hardware.vendor = 'IBM'  (string)
      system.hardware.version = 'ThinkPad T42p'  (string)

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index c353a64..87a1dd1 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -34,9 +34,9 @@
         <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">
+      <!-- T42, T42p -->
+      <match key="system.hardware.product" prefix_outof="2378;2379">
+        <match key="system.hardware.version" prefix="ThinkPad T42">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         </match>
       </match>