hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree ee66160160860c893c799a2799327dba26c6e61b (from 1b822a7d45514b59ce459c86db610c527e230675)
Author: Derek Ditch <dpdm85 at umr.edu>
Date:   Sun Sep 30 18:37:22 2007 +0100

    add suspend quirk for x61 tablet
    
    This patch, along with blacklisting the video module (not sure if that
    made a difference), allows me to come out of suspend correctly.
    Previously the backlight wouldn't come on until I did a mode switch
    (ctrl+alt+F8, then back to X).  Now I just have to get my backlight
    controls working correctly (read: working at all).

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index f092799..daccdf9 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -7,6 +7,10 @@
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
+      <!-- X61 Tablet -->
+      <match key="system.hardware.product" prefix="7764">
+        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+      </match>
       <match key="system.hardware.product" prefix="63664DU">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
       </match>