hal: Branch 'master' - 2 commits

[Richard Hughes]

 fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi |   10 ++++++++++
 fdi/information/10freedesktop/30-keymap-misc.fdi         |    1 +
 2 files changed, 11 insertions(+)

New commits:
diff-tree ca4537fc6beb6da309ffbcc4b343aa50a39d2011 (from a0306e3bb4539461f14da7f7837a9f455bb1a265)
Author: Lane Brooks <lbrooks at MIT.EDU>
Date:   Thu Jul 19 12:29:30 2007 +0100

    add suspend quirk for Panasonic Toughtbook CF-Y2
    
    The kernel and pm-utils from updates testing works if I use the vbe-post
    quirk.  Attached is the hal-info patch.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index 094411b..37309d3 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -117,4 +117,14 @@
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
   </device>
+
+  <device>
+    <match key="system.hardware.vendor" prefix="Matsushita Electric Industrial C
+o.,Ltd.">
+      <match key="system.hardware.product" string="CF-Y2FWPZZBM">
+        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+      </match>
+    </match>
+  </device>
+
 </deviceinfo>
diff-tree a0306e3bb4539461f14da7f7837a9f455bb1a265 (from 61c171876a537a4f315aa14dbfeb792d9bf4ee9f)
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Jul 17 18:01:41 2007 +0100

    add a key pointed out by lennart whilst sitting next to me at guadec

diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index 8c2d0cb..63d4f4b 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -43,6 +43,7 @@
           <append key="input.keymap.data" type="strlist">e06c:email</append> <!-- envelope button -->
           <append key="input.keymap.data" type="strlist">e032:www</append> <!-- www button -->
           <append key="input.keymap.data" type="strlist">e076:wlan</append> <!-- wlan -->
+          <append key="input.keymap.data" type="strlist">e062:bluetooth</append> <!-- satellite dish2 -->
           <append key="input.keymap.data" type="strlist">e079:search</append> <!-- search -->
           <append key="input.keymap.data" type="strlist">e071:unknown</append> <!-- plug -->
           <append key="input.keymap.data" type="strlist">e072:unknown</append> <!-- unplug -->