hal: Branch 'master'

[Danny Kukawka]

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

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

    added video quirk for Lenovo ThinkPad X61 Tablet
    
    Added video quirk for Lenovo ThinkPad X61 Tablet, needed to resume i
    from SuspendToRam from X and init=/bin/bash.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index a0a36a8..f092799 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -33,6 +33,13 @@
       <match key="system.hardware.version" string="766314G">
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
+
+      <!-- X61 Tablet , system.hardware.version='ThinkPad X61 Tablet' -->
+      <match key="system.hardware.product" string="7767C3U">
+        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+        <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+      </match>
+
     </match>
   </device>
 </deviceinfo>