hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 81112860baf50e11a602d8b30fea43eb86a3da6a
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Jan 17 14:47:51 2008 +0100

    suspend quirk for Fujitsu Siemens Lifebook P7120
    
    Applied adopted patch, reported by Fabian Fagerholm <fabbe at paniq.net>
    for a Fujitsu Siemens Lifebook P7120

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
index e5f54ad..1ee5210 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
@@ -48,7 +48,7 @@
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.reset_brightness" type="bool">true</merge>
         </match>
-        <match key="system.hardware.product" contains="E4010">
+        <match key="system.hardware.product" contains_outof="E4010;P7120">
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
         <match key="system.hardware.product" contains="E8020">