hal-info: Branch 'master' - 2 commits

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi        |    2 +-
 fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d896711d7f916f020e446ad9aeffd2e305286789
Author: Tim Ansell <mithro at mithis.com>
Date:   Thu Apr 3 22:31:03 2008 +0200

    added suspend quirks for a Sony Vaio VGN-TZ16GN
    
    Added suspend quirks for a Sony Vaio VGN-TZ16GN (see:
    https://launchpad.net/bugs/198208)

diff --git a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
index 1e1be69..10b4679 100644
--- a/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
+++ b/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
@@ -17,7 +17,7 @@
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
 
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="VGN-FS790B;VGN-TZ11;VGN-SZ71WN_C">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="VGN-FS790B;VGN-TZ11;VGN-TZ16;VGN-SZ71WN_C">
           <append key="input.keymap.data" type="strlist">0x06:mute</append> <!-- Fn+F2 mute -->
           <append key="input.keymap.data" type="strlist">0x07:volumedown</append> <!-- Fn+F3 mixer down -->
           <append key="input.keymap.data" type="strlist">0x08:volumeup</append> <!-- Fn+F4 mixer up -->
commit f8cccf7a0b6e72f7879bb05c090027c43be5bc69
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Thu Apr 3 22:23:12 2008 +0200

    added Suspend quirk for Thinkpad X31 with Radeon M6
    
    In https://launchpad.net/bugs/199059, an user reported a suspend
    quirk for a slightly different variant of the X31.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index 4a987be..95c857e 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -33,7 +33,7 @@
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
       <!-- X31 -->
-      <match key="system.hardware.product" prefix="2672">
+      <match key="system.hardware.product" prefix="2672;2673">
         <match key="system.hardware.version" contains="X31">
           <merge key="power_management.quirk.dpms_suspend" type="bool">true</merge>
           <!-- already added above