hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree c4b358abcf2e627109426db222c94244e4115124 (from ffdf0a433d21b2fde36a1d222b40bfed4ad524ad)
Author: Klaasjan Brand <klaasjan at gmail.com>
Date:   Sun Jun 3 18:01:15 2007 +0100

    add Acer TravelMate 8000 resume quirk
    
    After installing Fedora 7 and having read the excellent 'sleep quirk debugger'
    page I figured out the Acer TravelMate 8000 suspend works fine with an S3 bios
    quirk to wake up the video after resuming. Here's the requested patch.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index 483d814..966667f 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -41,6 +41,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" prefix="TravelMate 8000">
+        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+      </match>
       <match key="system.hardware.product" prefix="Aspire">
         <match key="system.hardware.product" contains="1690">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>