hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree 75e7bd870a27329a612a1220d9a16b141dce952a (from 4e6f2c6c565374ad22cc9e0ba1d44479d020a86b)
Author: Tomasz Torcz <zdzichu at irc.pl>
Date:   Tue Oct 10 19:00:34 2006 +0100

    Add ThinkPad X60 and X60s to the list of laptops needing
    laptop_panel.brightness_in_hardware

diff --git a/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
index cb25a66..21c6e4a 100644
--- a/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
+++ b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
@@ -37,6 +37,12 @@
         <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 key="/org/freedesktop/Hal/devices/computer:smbios.system.version" string="ThinkPad X60">
+          <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
+        </match>
+        <match key="/org/freedesktop/Hal/devices/computer:smbios.system.version" string="ThinkPad X60s">
+          <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
+        </match>
       </match>
     </match>
   </device>