hal: Branch 'master'

[Richard Hughes]

 fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

New commits:
diff-tree 10333cf444c0f57257b693c3a433b5dcb11a860e (from 28444f5ef1c23ca5bbeaad17ddcbc84e4c42f33b)
Author: Tomasz Torcz <zdzichu at irc.-nie.spam-.pl>
Date:   Tue Oct 10 18:22:09 2006 +0100

    Add ThinkPad T60 to the list of laptops needing laptop_panel.brightness_in_hardware
    
    I got confirmation that this is needed for Thinkpad T60 also. See
    comments at https://launchpad.net/distros/ubuntu/+source/hal/+bug/61184

diff --git a/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
index f27201d..cb25a66 100644
--- a/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
+++ b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
@@ -22,7 +22,7 @@
        but the hardware also synthesizes keypresses when the brightness is
        changed. This gives power manager software problems as the brightness
        can get into a feedback state so the panel flashes uncontrollably.
-       This is a hardware "feature" seen on IBM x31 and Lenovo z61t laptops. -->
+       This is a hardware "feature" seen on some IBM and Lenovo laptops. -->
   <device>
     <match key="info.category" string="laptop_panel">
       <match key="/org/freedesktop/Hal/devices/computer:smbios.system.manufacturer" string="IBM">
@@ -34,6 +34,9 @@
         <match key="/org/freedesktop/Hal/devices/computer:smbios.system.version" string="ThinkPad Z31t">
           <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
         </match>
+        <match key="/org/freedesktop/Hal/devices/computer:smbios.system.version" string="ThinkPad T60">
+          <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
+        </match>
       </match>
     </match>
   </device>