hal: Branch 'master'

[Richard Hughes]

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

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

    Add Z31t to the list of laptops needing laptop_panel.brightness_in_hardware
    
    Tomasz Torcz wrote:
    I have TP z61t, and I had to add: laptop_panel.brightness_in_hardware
    to 10-laptop-panel-mgmt-policy.fdi

diff --git a/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
index 65f3199..f27201d 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 laptops. -->
+       This is a hardware "feature" seen on IBM x31 and Lenovo z61t laptops. -->
   <device>
     <match key="info.category" string="laptop_panel">
       <match key="/org/freedesktop/Hal/devices/computer:smbios.system.manufacturer" string="IBM">
@@ -30,6 +30,11 @@
           <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
         </match>
       </match>
+      <match key="/org/freedesktop/Hal/devices/computer:smbios.system.manufacturer" string="LENOVO">
+        <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>
     </match>
   </device>