hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree fce34e75f626dcd7519ad49e2d7d303b03d84719 (from 3a28134816fac4f19138b119cb9775e33405f032)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Sep 19 13:37:14 2007 +0200

    added video quirks for some Sony Vaio Laptops
    
    Added video quirks for some Sony Vaio Laptops (VGN-TX3HP, VGN-TX5MN_W,
    VGN-TZ11*) needed to resume from SuspendToRam.
    
    https://bugzilla.novell.com/show_bug.cgi?id=310223

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
index d49f049..04231cf 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
@@ -12,6 +12,17 @@
       <match key="system.hardware.product" string="VGN-FS730">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
       </match>
+      <match key="system.hardware.product" string="VGN-TX5MN_W">
+	<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+      </match>
+
+      <!---> machines which need no quirks -->
+      <match key="system.hardware.product" string_outof="VGN-TX3HP">
+	<merge key="power_management.quirk.none" type="bool">true</merge>
+      </match>
+      <match key="system.hardware.product" contains="VGN-TZ11">
+	<merge key="power_management.quirk.none" type="bool">true</merge>
+      </match>
     </match>
   </device>
 </deviceinfo>