hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit bd1ac7c2d693c6966217d75ac985436798711fd6
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Mar 13 21:58:37 2008 +0100

    add suspend quirk for a Samsung P35
    
    Applied slightly adopted patch from Nikolaus Filus <nfilus at gmx.net>
    to add suspend quirks for a Samsung P35.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
index 76b016f..a01ace9 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
@@ -6,8 +6,8 @@
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
-      <!-- Samsung UMPC -->
-      <match key="system.hardware.product" string="R40/R41">
+      <!-- Samsung UMPC, P35 -->
+      <match key="system.hardware.product" string_outof="R40/R41;CoronaR">
         <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
       </match>
       <match key="system.hardware.product" string_outof="SX20S;SENS V25;NX05S">