hal: Branch 'master'

[Richard Hughes]

 fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f1368a36a65d302801f7e09d3ff9c8fc6eb01860
Author: Thomas Reifenberger <tommi.reifenberger at web.de>
Date:   Tue Feb 19 14:07:32 2008 +0000

    add suspend quirk for Acer Aspire 5500
    
    I got suspend working on an Acer Aspire 5500 with a Radeon-Mobility x700
    (open-source drivers) by using the vbe-post quirk.
    When using suspend from the gnome-dislplay-manager, the display shows
    black and white blocks for some seconds after resuming, but then the
    lock-screen unlock dialog appears and it works.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index 2888544..d4a7452 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -65,7 +65,7 @@
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
           <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
         </match>
-        <match key="system.hardware.product" contains_outof="5610;5020">
+        <match key="system.hardware.product" contains_outof="5610;5020;5500">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         </match>
         <match key="system.hardware.product" contains_outof="1520;3000;5110;5570;5920">