hal: Branch 'master'

[Richard Hughes]

 fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi |    4 ++++
 1 files changed, 4 insertions(+)

New commits:
diff-tree 89e45b45cb2433541cdd017c54a740eb1ff03aa2 (from d94c858ff130a64348c802848a1ba630757d1654)
Author: William Ritchie <billr at domsys.com>
Date:   Mon Jul 9 15:19:49 2007 +0100

    add video resume quirk for hp nc6120

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index 58c0131..065f768 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -62,6 +62,10 @@
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
       </match>
+      <match key="system.hardware.product" contains="nc6120">
+        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+      </match>
     </match>
   </device>
 </deviceinfo>