hal-info: Branch 'master' - 3 commits

[Martin Pitt]

 fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi |    1 +
 fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi |    3 +++
 fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi  |    6 ++----
 3 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 838151abc31d1cfcf0be3d9768ce01a05400e0f8
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Mon Feb 9 14:37:27 2009 +0100

    suspend quirks for some more IBM ThinkPad X31 variants
    
    Add quirks for some more variants for IBM ThinkPad X31, and fix
    radeon_off quirk for variants 2884 and 2885. Taken from Ubuntu's
    acpi-support package.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index 9e29a7e..b8800a6 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -50,12 +50,10 @@
         </match>
       </match>
       <!-- X31 -->
-      <match key="system.hardware.product" prefix_outof="2672;2673;2884;2885">
+      <match key="system.hardware.product" prefix_outof="2672;2673;2884;2885;2890;2891">
         <match key="system.hardware.version" contains="X31">
           <merge key="power_management.quirk.dpms_suspend" type="bool">true</merge>
-          <!-- already added above
-            <merge key="power_management.quirk.radeon_off" type="bool">true</merge>
-           -->
+          <merge key="power_management.quirk.radeon_off" type="bool">true</merge>
         </match>
         <match key="system.hardware.version" contains="X32">
           <merge key="power_management.quirk.dpms_suspend" type="bool">true</merge>
commit 8f0d983f2662beb69d110c982d4033efebb872f7
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Mon Feb 9 14:25:34 2009 +0100

    add suspend quirk for Dell Inspiron 8600
    
    Add suspend quirk for Dell Inspiron 8600. Taken from Ubuntu's
    acpi-support package.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 446b7e3..8782081 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -75,6 +75,9 @@
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
+        <match key="system.hardware.product" contains_outof="8600">
+          <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+        </match>
         <match key="system.hardware.product" contains_outof="500m;600m;1100;1420;1525;2200;5160">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
commit a9288488dff501c3d59591f3c5199a8b68c637a1
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Mon Feb 9 14:21:18 2009 +0100

    update Acer TravelMate 3260 suspend quirks
    
    Acer TravelMate 3260 needs the pci_save suspend quirk for uswsusp.
    Taken from Ubuntu's acpi-support package.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index 2c57326..1d70e7f 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -17,6 +17,7 @@
         <match key="system.hardware.product" contains_outof="2300;2310;3010;3020;3260;6291">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+          <merge key="power_management.quirk.pci_save" type="bool">true</merge>
         </match>
         <match key="system.hardware.product" contains_outof="7520;8000">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>