hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 4d4ae4369975a076b912b2dc94ef7abd0d780852
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Nov 14 20:54:44 2007 +0100

    aggregate some similar Lenovo entries
    
    Aggregated some similar Lenovo entries to one match.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index dd4b03b..6ae85d1 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -45,13 +45,9 @@
       <match key="system.hardware.product" prefix="7663">
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
-      <!-- T61p, does not work with the NVidia driver -->
-      <match key="system.hardware.product" prefix="6460">
-        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
-	<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;6464">
+      <!-- T61 (8895), intel card 32bit works with S3_MODE, but 64bit needs VBE_MODE 
+	   T61p (6460), does not work with the NVidia driver-->
+      <match key="system.hardware.product" prefix_outof="8895;6460;6464">
 	<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
 	<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
       </match>