hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree 90634f0b6b79dcc0e01f9af1569d69700ab6d1fe (from 38ae34b634403b75bfbf4c7a43ea7951d623dc2d)
Author: Santi Béjar <sbejar at gmail.com>
Date:   Fri Aug 24 13:40:48 2007 +0100

    add video quirks for Acer Travelmate 250
    
    here it is the quirks needed for a Acer Travelmate 250, very similar
    to the ones for the Travelmate 240 as both are very similar laptops.
    I've tested it in X and in the console.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index 966667f..3b4bee4 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -27,6 +27,10 @@
         <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 250">
+        <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 380">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>