hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 29dd11d7db7d028485feb84e6a8878c2dc0fa32a
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Nov 9 13:21:46 2007 +0100

    updated suspend quirks for Compaq Armada with s2ram commit -r1.115
    
    Updated suspend quirks for Compaq Armada with changes in s2ram whitelist i
    from cvs commit -r1.115.
    
    Added new:
    - M70, M700

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index b473e83..efb2562 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -6,7 +6,7 @@
     <match key="system.hardware.vendor" prefix="Compaq">
       <!-- Compaq Amada -->
       <match key="system.hardware.product" prefix="Armada">
-        <match key="system.hardware.product" contains="    E500  ">
+        <match key="system.hardware.product" contains="    E500  ;     M70  ;    M700 ">
           <merge key="power_management.quirk.none" type="bool">true</merge>
         </match>
         <!-- This Armada m300 seems not to have a useful model description, so to make sure also check the bios_version-->