hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree 1b822a7d45514b59ce459c86db610c527e230675 (from c832d5ad0003827a433986b679cfaf33c8b4ae23)
Author: Patrick <fedora at puzzled.xs4all.nl>
Date:   Sun Sep 30 18:34:45 2007 +0100

    Attached is a patch for hal-info that makes the Acer Travelmate 6460
    series properly resume from suspend. The patch is against hal-info
    version 20070516 from Fedora 7. More info available here:
    https://bugzilla.redhat.com/show_bug.cgi?id=250596#c12

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index 71c91b3..31e7715 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -62,6 +62,9 @@
         <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" string="TravelMate 6460">
+        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+      </match>
     </match>
   </device>
 </deviceinfo>