hal: Branch 'master' - 3 commits

[Richard Hughes]

 fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi |    4 ++++
 fdi/information/10freedesktop/30-keymap-lenovo.fdi         |    4 ++++
 2 files changed, 8 insertions(+)

New commits:
diff-tree 852987a6ebdbb5fd39ded75c3ccc7ab09c83856a (from parents)
Merge: 7568efd6e3489a86d3c36d9ad1dff12c68bc5a7d b68097f2997d57bf1be81b7b0810c87254f46e4f
Author: Richard Hughes <richard at hughsie.com>
Date:   Sat Jul 7 10:56:15 2007 +0100

    Merge branch 'master' of git+ssh://hughsient@git.freedesktop.org/git/hal-info

diff-tree 7568efd6e3489a86d3c36d9ad1dff12c68bc5a7d (from 8498ef7caded7e88d0c582c0be67495b6aacb0cc)
Author: Bryan O'Sullivan <bos at serpentine.com>
Date:   Sat Jul 7 10:52:57 2007 +0100

    add suspend quirk for another x60
    
    Added quirk for another x60 model

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index 5fb237f..a6a4037 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -11,6 +11,10 @@
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
+      <match key="system.hardware.product" prefix="1709">
+        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+        <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+      </match>
       <match key="system.hardware.product" prefix="63664DU">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
       </match>
diff-tree 8498ef7caded7e88d0c582c0be67495b6aacb0cc (from d90c832ba2353c12008c2ff02396613337ec8de2)
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Jul 5 13:47:11 2007 +0100

    add some new entries for the thinkpad driver
    
    Now the thinkpad driver can discover high-bit keys without polling it can
    be used with setkeycodes to emit input events for these buttons. This means
    we can get the blue thinkpad button and brightness button events.

diff --git a/fdi/information/10freedesktop/30-keymap-lenovo.fdi b/fdi/information/10freedesktop/30-keymap-lenovo.fdi
index 83b13a5..6d2876b 100644
--- a/fdi/information/10freedesktop/30-keymap-lenovo.fdi
+++ b/fdi/information/10freedesktop/30-keymap-lenovo.fdi
@@ -32,6 +32,10 @@
           <append key="input.keymap.data" type="strlist">0x07:f22</append> <!-- Fn+F8 touchpadtoggle -->
           <append key="input.keymap.data" type="strlist">0x08:f24</append> <!-- Fn+F9 undock -->
           <append key="input.keymap.data" type="strlist">0x0b:suspend</append> <!-- Fn+F12 hibernate -->
+          <append key="input.keymap.data" type="strlist">0x0f:brightnessup</append> <!-- Fn+Home -->
+          <append key="input.keymap.data" type="strlist">0x10:brightnessdown</append> <!-- Fn+End -->
+          <append key="input.keymap.data" type="strlist">0x13:zoom</append> <!-- Fn+Space -->
+          <append key="input.keymap.data" type="strlist">0x17:blue</append> <!-- ThinkPad/ThinkVantage button -->
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
       </match>