hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 8c962ed182454efb9b5bcd11c99387b00f28daf7
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Nov 9 16:06:27 2007 +0100

    added suspend quirk for Samsung NX05S
    
    Added suspend quirk for Samsung NX05S, from s2ram/suspend

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
index 2b9fbc0..dc49c22 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
@@ -15,7 +15,7 @@
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
       </match>
-      <match key="system.hardware.product" string_outof="SX20S;SENS V25">
+      <match key="system.hardware.product" string_outof="SX20S;SENS V25;NX05S">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
       </match>