hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit a16a949aa9a56fd89624dff65ef1f275532c17f4
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Mar 13 21:53:47 2008 +0100

    cleanup suspend quirks for Samsung UMPC R40/R41
    
    Cleanuped suspend quirks for Samsung UMPC R40/R41.

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