hal: Branch 'master' - 2 commits

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi |    6 ++++++
 fdi/information/10freedesktop/30-keymap-acer.fdi       |    1 +
 2 files changed, 7 insertions(+)

New commits:
commit 75e450e1e89aa2050096a572397e5764d9c6b1fb
Author: Osma Ahvenlampi <oa at iki.fi>
Date:   Tue Dec 11 13:39:48 2007 +0100

    added comment about Acer TM 6292
    
    Added comment about Acer TM 6292.
    
    > As you submitted the original patch for the TravelMate 6292
    > (http://lists.freedesktop.org/archives/hal/2007-August/009347.html), is the
    > match on "6292" for product correct?
    
    Yes:
    
    $ sudo dmidecode --string system-product-name
    TravelMate 6292
    
    [...]

diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index b9c080f..98135eb 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -163,6 +163,7 @@
             <append key="info.capabilities" type="strlist">input.keymap</append>
           </match>
           <!-- Laptops without extra Euro and Dollar keys -->
+	  <!-- TM6292 really does identify as 6292 instead of 6290 -->
           <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="3000;6292">
             <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
             <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
commit 2436d23ae9ddac18cc7a53269520c0b14e5ef5b0
Author: Matej Cepl <mcepl at redhat.com>
Date:   Tue Dec 11 13:36:26 2007 +0100

    suspend quirks for HP Compaq 6710s
    
    Added suspend quirks for HP Compaq 6710s.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index 5737eb9..a01e02f 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -61,6 +61,12 @@
         <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         <merge key="power_management.quirk.no_fb" type="bool">true</merge>
       </match>
+      <match key="system.hardware.product" contains="6710s">
+	<match key="system.firmware.version" contains="68DDU">
+          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+          <merge key="power_management.quirk.dpms_on" type="bool">true</merge>
+        </match>
+      </match>
       <match key="system.hardware.product" contains_outof="OmniBook XE3 G;R3200;nx5000;nx7000;nc6120;nx6325;6510b">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>