hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree 2ebf1f1354e708fc884b4dbd16e782766e520753 (from dd2df012362d608e50b52dee5cf9f6e4903bc229)
Author: ilw <ilw at adx.ru>
Date:   Tue Jun 5 11:59:21 2007 +0100

    add quirk for HP Pavilion ze2000

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index a064fb9..58c0131 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -16,6 +16,10 @@
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
       </match>
+      <match key="system.hardware.product" contains="ze2000">
+    	<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" contains="nc6000">
         <match key="system.firmware.version" prefix="68BDD">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>