hal: Branch 'master'

[Richard Hughes]

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

New commits:
commit 2caa815dcc109d0ad269e5108963aa0fdf31a275
Author: Karl Misselt <misselt at as.aizona.edu>
Date:   Wed Oct 17 22:37:06 2007 +0100

    Suspend Patch for Dell Inspiron 1420n
    
    Tested with Dell Inspiron 1420n pre-installed with Ubuntu.  On  a
    clean Fedora 8 Test 3 install, suspend doesn't work.  Adding 1420
    to the 'contains' match under inspiron results in a working suspend.
    Still trying to get wireless (iwl3945) to survive through the suspend,
    but that's a bit a easier when your screen comes back!

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 3e8f67c..35756ae 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -58,7 +58,7 @@
 
       <!-- Dell Inspiron -->
       <match key="system.hardware.product" prefix="Inspiron">
-        <match key="system.hardware.product" contains_outof="5150;8000">
+        <match key="system.hardware.product" contains_outof="5150;8000;1420">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>