hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit aff096771964b2efa2fe66934d3b218188ad6f9a
Author: Jan HutaÅ™ <jhutar at redhat.com>
Date:   Wed Nov 14 20:52:42 2007 +0100

    fix black screen after resume on T61
    
    This patch helped me with correct resume on T61.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index 509ceb8..dd4b03b 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -51,7 +51,7 @@
 	<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
       </match>
       <!-- T61, intel card 32bit works with S3_MODE, but 64bit needs VBE_MODE -->
-      <match key="system.hardware.product" prefix="8895">
+      <match key="system.hardware.product" prefix="8895;6464">
 	<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
 	<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
       </match>