hal: Branch 'master' - 2 commits

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi    |    3 ++-
 fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b4f75ce7fd711e2799b5b3caf01871659cce28e5
Author: Mikko Vatanen <mvatanen at cs.joensuu.fi>
Date:   Mon Mar 17 21:41:33 2008 +0100

    suspend quirk for Fujitsu Siemens AMILO Li1718
    
    This fixed suspend on my Fujitsu Siemens AMILO Li1718 running Debian
    development version and ATI proprietary drivers. Hopefully this
    information is useful for you. I have tried suspending from console and
    X11 several times and works well.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
index 1ee5210..dea1f1a 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
@@ -4,7 +4,7 @@
     <match key="system.hardware.vendor" prefix="FUJITSU">
       
       <match key="system.hardware.product" contains_ncase="amilo">
-        <match key="system.hardware.product" contains_outof="A1667G Serie;Pa 1510">
+        <match key="system.hardware.product" contains_outof="A1667G Serie;Pa 1510;Li 1718">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         </match>
         <match key="system.hardware.product" contains_outof="Pro V3205;Pro Edition V3405;Xi 1546;Si 1520">
commit 52aca866b1781f388220738bcd230bf6d069722c
Author: Steve Tyler <stephent98 at hotmail.com>
Date:   Mon Mar 17 21:39:30 2008 +0100

    video quirk for ASUS Z91E (aka A3E)
    
    Video quirk patch for ASUS Z91E notebook, which is identified as A3E in hal.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index 060bd09..f33735c 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -19,7 +19,8 @@
         <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" prefix="A6U ">
+      <!-- Z91E is identified as A3E -->
+      <match key="system.hardware.product" prefix_outof="A6U;A3E">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
       </match>